From 79d1bf30a49e1fd1ef1f8b743a9aff84d104fb89 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 21 Jun 2018 01:21:57 +0900
Subject: リモートユーザーのHTMLで表現されたプロフィールをMFMに変換するように
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/components/messaging-room.message.vue    |   2 +-
 .../views/components/misskey-flavored-markdown.ts  |   2 +-
 .../app/desktop/views/components/note-detail.vue   |   2 +-
 .../app/desktop/views/components/notes.note.vue    |   2 +-
 .../app/desktop/views/components/post-form.vue     |   2 +-
 .../app/desktop/views/pages/deck/deck.note.vue     |   2 +-
 .../app/mobile/views/components/note-detail.vue    |   2 +-
 src/client/app/mobile/views/components/note.vue    |   2 +-
 .../app/mobile/views/components/post-form.vue      |   2 +-
 src/mfm/html-to-mfm.ts                             |  71 +++++
 src/mfm/html.ts                                    | 102 ++++++
 src/mfm/parse/core/syntax-highlighter.ts           | 341 +++++++++++++++++++++
 src/mfm/parse/elements/bold.ts                     |  20 ++
 src/mfm/parse/elements/code.ts                     |  24 ++
 src/mfm/parse/elements/emoji.ts                    |  20 ++
 src/mfm/parse/elements/hashtag.ts                  |  25 ++
 src/mfm/parse/elements/inline-code.ts              |  24 ++
 src/mfm/parse/elements/link.ts                     |  27 ++
 src/mfm/parse/elements/mention.ts                  |  24 ++
 src/mfm/parse/elements/quote.ts                    |  20 ++
 src/mfm/parse/elements/search.ts                   |  19 ++
 src/mfm/parse/elements/title.ts                    |  20 ++
 src/mfm/parse/elements/url.ts                      |  20 ++
 src/mfm/parse/index.ts                             |  99 ++++++
 src/remote/activitypub/misc/get-note-html.ts       |   4 +-
 src/remote/activitypub/models/note.ts              |  74 +----
 src/remote/activitypub/models/person.ts            |   9 +-
 src/services/note/create.ts                        |   2 +-
 src/text/html.ts                                   | 102 ------
 src/text/parse/core/syntax-highlighter.ts          | 341 ---------------------
 src/text/parse/elements/bold.ts                    |  20 --
 src/text/parse/elements/code.ts                    |  24 --
 src/text/parse/elements/emoji.ts                   |  20 --
 src/text/parse/elements/hashtag.ts                 |  25 --
 src/text/parse/elements/inline-code.ts             |  24 --
 src/text/parse/elements/link.ts                    |  27 --
 src/text/parse/elements/mention.ts                 |  24 --
 src/text/parse/elements/quote.ts                   |  20 --
 src/text/parse/elements/search.ts                  |  19 --
 src/text/parse/elements/title.ts                   |  20 --
 src/text/parse/elements/url.ts                     |  20 --
 src/text/parse/index.ts                            |  99 ------
 42 files changed, 873 insertions(+), 875 deletions(-)
 create mode 100644 src/mfm/html-to-mfm.ts
 create mode 100644 src/mfm/html.ts
 create mode 100644 src/mfm/parse/core/syntax-highlighter.ts
 create mode 100644 src/mfm/parse/elements/bold.ts
 create mode 100644 src/mfm/parse/elements/code.ts
 create mode 100644 src/mfm/parse/elements/emoji.ts
 create mode 100644 src/mfm/parse/elements/hashtag.ts
 create mode 100644 src/mfm/parse/elements/inline-code.ts
 create mode 100644 src/mfm/parse/elements/link.ts
 create mode 100644 src/mfm/parse/elements/mention.ts
 create mode 100644 src/mfm/parse/elements/quote.ts
 create mode 100644 src/mfm/parse/elements/search.ts
 create mode 100644 src/mfm/parse/elements/title.ts
 create mode 100644 src/mfm/parse/elements/url.ts
 create mode 100644 src/mfm/parse/index.ts
 delete mode 100644 src/text/html.ts
 delete mode 100644 src/text/parse/core/syntax-highlighter.ts
 delete mode 100644 src/text/parse/elements/bold.ts
 delete mode 100644 src/text/parse/elements/code.ts
 delete mode 100644 src/text/parse/elements/emoji.ts
 delete mode 100644 src/text/parse/elements/hashtag.ts
 delete mode 100644 src/text/parse/elements/inline-code.ts
 delete mode 100644 src/text/parse/elements/link.ts
 delete mode 100644 src/text/parse/elements/mention.ts
 delete mode 100644 src/text/parse/elements/quote.ts
 delete mode 100644 src/text/parse/elements/search.ts
 delete mode 100644 src/text/parse/elements/title.ts
 delete mode 100644 src/text/parse/elements/url.ts
 delete mode 100644 src/text/parse/index.ts

(limited to 'src')

diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue
index d7e7c6dcb5..f33173da6f 100644
--- a/src/client/app/common/views/components/messaging-room.message.vue
+++ b/src/client/app/common/views/components/messaging-room.message.vue
@@ -32,7 +32,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import parse from '../../../../../text/parse';
+import parse from '../../../../../mfm/parse';
 
 export default Vue.extend({
 	props: {
diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.ts b/src/client/app/common/views/components/misskey-flavored-markdown.ts
index 61dbc02d9a..30ad3ce3f2 100644
--- a/src/client/app/common/views/components/misskey-flavored-markdown.ts
+++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import * as emojilib from 'emojilib';
-import parse from '../../../../../text/parse';
+import parse from '../../../../../mfm/parse';
 import getAcct from '../../../../../acct/render';
 import { url } from '../../../config';
 import MkUrl from './url.vue';
diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
index 017f599e31..a9640ff9c4 100644
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -83,7 +83,7 @@
 <script lang="ts">
 import Vue from 'vue';
 import dateStringify from '../../../common/scripts/date-stringify';
-import parse from '../../../../../text/parse';
+import parse from '../../../../../mfm/parse';
 
 import MkPostFormWindow from './post-form-window.vue';
 import MkRenoteFormWindow from './renote-form-window.vue';
diff --git a/src/client/app/desktop/views/components/notes.note.vue b/src/client/app/desktop/views/components/notes.note.vue
index 661223ee25..b96ae2da5a 100644
--- a/src/client/app/desktop/views/components/notes.note.vue
+++ b/src/client/app/desktop/views/components/notes.note.vue
@@ -76,7 +76,7 @@
 import Vue from 'vue';
 import dateStringify from '../../../common/scripts/date-stringify';
 import canHideText from '../../../common/scripts/can-hide-text';
-import parse from '../../../../../text/parse';
+import parse from '../../../../../mfm/parse';
 
 import MkPostFormWindow from './post-form-window.vue';
 import MkRenoteFormWindow from './renote-form-window.vue';
diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue
index 33f2288e06..3832e5b38c 100644
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -49,7 +49,7 @@ import Vue from 'vue';
 import * as XDraggable from 'vuedraggable';
 import getKao from '../../../common/scripts/get-kao';
 import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue';
-import parse from '../../../../../text/parse';
+import parse from '../../../../../mfm/parse';
 import { host } from '../../../config';
 
 export default Vue.extend({
diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue
index 067297af37..d50fc3c235 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note.vue
@@ -67,7 +67,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import parse from '../../../../../../text/parse';
+import parse from '../../../../../../mfm/parse';
 import canHideText from '../../../../common/scripts/can-hide-text';
 
 import MkNoteMenu from '../../../../common/views/components/note-menu.vue';
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index 6499f78f1b..76633490fd 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -83,7 +83,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import parse from '../../../../../text/parse';
+import parse from '../../../../../mfm/parse';
 
 import MkNoteMenu from '../../../common/views/components/note-menu.vue';
 import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';
diff --git a/src/client/app/mobile/views/components/note.vue b/src/client/app/mobile/views/components/note.vue
index 77513a6591..ecdfee3b44 100644
--- a/src/client/app/mobile/views/components/note.vue
+++ b/src/client/app/mobile/views/components/note.vue
@@ -68,7 +68,7 @@
 
 <script lang="ts">
 import Vue from 'vue';
-import parse from '../../../../../text/parse';
+import parse from '../../../../../mfm/parse';
 import canHideText from '../../../common/scripts/can-hide-text';
 
 import MkNoteMenu from '../../../common/views/components/note-menu.vue';
diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue
index 62fa185085..1015a44115 100644
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@@ -45,7 +45,7 @@ import Vue from 'vue';
 import * as XDraggable from 'vuedraggable';
 import MkVisibilityChooser from '../../../common/views/components/visibility-chooser.vue';
 import getKao from '../../../common/scripts/get-kao';
-import parse from '../../../../../text/parse';
+import parse from '../../../../../mfm/parse';
 import { host } from '../../../config';
 
 export default Vue.extend({
diff --git a/src/mfm/html-to-mfm.ts b/src/mfm/html-to-mfm.ts
new file mode 100644
index 0000000000..540635036a
--- /dev/null
+++ b/src/mfm/html-to-mfm.ts
@@ -0,0 +1,71 @@
+const parse5 = require('parse5');
+
+export default function(html: string): string {
+	const dom = parse5.parseFragment(html);
+
+	let text = '';
+
+	dom.childNodes.forEach((n: any) => analyze(n));
+
+	return text.trim();
+
+	function getText(node: any) {
+		if (node.nodeName == '#text') return node.value;
+
+		if (node.childNodes) {
+			return node.childNodes.map((n: any) => getText(n)).join('');
+		}
+
+		return '';
+	}
+
+	function analyze(node: any) {
+		switch (node.nodeName) {
+			case '#text':
+				text += node.value;
+				break;
+
+			case 'br':
+				text += '\n';
+				break;
+
+			case 'a':
+				const txt = getText(node);
+
+				// メンション
+				if (txt.startsWith('@')) {
+					const part = txt.split('@');
+
+					if (part.length == 2) {
+						//#region ホスト名部分が省略されているので復元する
+						const href = new URL(node.attrs.find((x: any) => x.name == 'href').value);
+						const acct = txt + '@' + href.hostname;
+						text += acct;
+						break;
+						//#endregion
+					} else if (part.length == 3) {
+						text += txt;
+						break;
+					}
+				}
+
+				if (node.childNodes) {
+					node.childNodes.forEach((n: any) => analyze(n));
+				}
+				break;
+
+			case 'p':
+				text += '\n\n';
+				if (node.childNodes) {
+					node.childNodes.forEach((n: any) => analyze(n));
+				}
+				break;
+
+			default:
+				if (node.childNodes) {
+					node.childNodes.forEach((n: any) => analyze(n));
+				}
+				break;
+		}
+	}
+}
diff --git a/src/mfm/html.ts b/src/mfm/html.ts
new file mode 100644
index 0000000000..64208af88b
--- /dev/null
+++ b/src/mfm/html.ts
@@ -0,0 +1,102 @@
+const { lib: emojilib } = require('emojilib');
+import { JSDOM } from 'jsdom';
+import config from '../config';
+import { INote } from '../models/note';
+import { TextElement } from './parse';
+
+const handlers: { [key: string]: (window: any, token: any, mentionedRemoteUsers: INote['mentionedRemoteUsers']) => void } = {
+	bold({ document }, { bold }) {
+		const b = document.createElement('b');
+		b.textContent = bold;
+		document.body.appendChild(b);
+	},
+
+	code({ document }, { code }) {
+		const pre = document.createElement('pre');
+		const inner = document.createElement('code');
+		inner.innerHTML = code;
+		pre.appendChild(inner);
+		document.body.appendChild(pre);
+	},
+
+	emoji({ document }, { content, emoji }) {
+		const found = emojilib[emoji];
+		const node = document.createTextNode(found ? found.char : content);
+		document.body.appendChild(node);
+	},
+
+	hashtag({ document }, { hashtag }) {
+		const a = document.createElement('a');
+		a.href = config.url + '/tags/' + hashtag;
+		a.textContent = '#' + hashtag;
+		a.setAttribute('rel', 'tag');
+		document.body.appendChild(a);
+	},
+
+	'inline-code'({ document }, { code }) {
+		const element = document.createElement('code');
+		element.textContent = code;
+		document.body.appendChild(element);
+	},
+
+	link({ document }, { url, title }) {
+		const a = document.createElement('a');
+		a.href = url;
+		a.textContent = title;
+		document.body.appendChild(a);
+	},
+
+	mention({ document }, { content, username, host }, mentionedRemoteUsers) {
+		const a = document.createElement('a');
+		const remoteUserInfo = mentionedRemoteUsers.find(remoteUser => remoteUser.username === username && remoteUser.host === host);
+		a.href = remoteUserInfo ? remoteUserInfo.uri : `${config.url}/${content}`;
+		a.textContent = content;
+		document.body.appendChild(a);
+	},
+
+	quote({ document }, { quote }) {
+		const blockquote = document.createElement('blockquote');
+		blockquote.textContent = quote;
+		document.body.appendChild(blockquote);
+	},
+
+	title({ document }, { content }) {
+		const h1 = document.createElement('h1');
+		h1.textContent = content;
+		document.body.appendChild(h1);
+	},
+
+	text({ document }, { content }) {
+		for (const text of content.split('\n')) {
+			const node = document.createTextNode(text);
+			document.body.appendChild(node);
+
+			const br = document.createElement('br');
+			document.body.appendChild(br);
+		}
+	},
+
+	url({ document }, { url }) {
+		const a = document.createElement('a');
+		a.href = url;
+		a.textContent = url;
+		document.body.appendChild(a);
+	},
+
+	search({ document }, { content, query }) {
+		const a = document.createElement('a');
+		a.href = `https://www.google.com/?#q=${query}`;
+		a.textContent = content;
+		document.body.appendChild(a);
+	}
+};
+
+export default (tokens: TextElement[], mentionedRemoteUsers: INote['mentionedRemoteUsers'] = []) => {
+	const { window } = new JSDOM('');
+
+	for (const token of tokens) {
+		handlers[token.type](window, token, mentionedRemoteUsers);
+	}
+
+	return `<p>${window.document.body.innerHTML}</p>`;
+};
diff --git a/src/mfm/parse/core/syntax-highlighter.ts b/src/mfm/parse/core/syntax-highlighter.ts
new file mode 100644
index 0000000000..3fb7a3b73d
--- /dev/null
+++ b/src/mfm/parse/core/syntax-highlighter.ts
@@ -0,0 +1,341 @@
+function escape(text: string) {
+	return text
+		.replace(/>/g, '&gt;')
+		.replace(/</g, '&lt;');
+}
+
+// 文字数が多い順にソートします
+// そうしないと、「function」という文字列が与えられたときに「func」が先にマッチしてしまう可能性があるためです
+const _keywords = [
+	'true',
+	'false',
+	'null',
+	'nil',
+	'undefined',
+	'void',
+	'var',
+	'const',
+	'let',
+	'mut',
+	'dim',
+	'if',
+	'then',
+	'else',
+	'switch',
+	'match',
+	'case',
+	'default',
+	'for',
+	'each',
+	'in',
+	'while',
+	'loop',
+	'continue',
+	'break',
+	'do',
+	'goto',
+	'next',
+	'end',
+	'sub',
+	'throw',
+	'try',
+	'catch',
+	'finally',
+	'enum',
+	'delegate',
+	'function',
+	'func',
+	'fun',
+	'fn',
+	'return',
+	'yield',
+	'async',
+	'await',
+	'require',
+	'include',
+	'import',
+	'imports',
+	'export',
+	'exports',
+	'from',
+	'as',
+	'using',
+	'use',
+	'internal',
+	'module',
+	'namespace',
+	'where',
+	'select',
+	'struct',
+	'union',
+	'new',
+	'delete',
+	'this',
+	'super',
+	'base',
+	'class',
+	'interface',
+	'abstract',
+	'static',
+	'public',
+	'private',
+	'protected',
+	'virtual',
+	'partial',
+	'override',
+	'extends',
+	'implements',
+	'constructor'
+];
+
+const keywords = _keywords
+	.concat(_keywords.map(k => k[0].toUpperCase() + k.substr(1)))
+	.concat(_keywords.map(k => k.toUpperCase()))
+	.sort((a, b) => b.length - a.length);
+
+const symbols = [
+	'=',
+	'+',
+	'-',
+	'*',
+	'/',
+	'%',
+	'~',
+	'^',
+	'&',
+	'|',
+	'>',
+	'<',
+	'!',
+	'?'
+];
+
+type Token = {
+	html: string
+	next: number
+};
+
+type Element = (code: string, i: number, source: string) => (Token | null);
+
+const elements: Element[] = [
+	// comment
+	code => {
+		if (code.substr(0, 2) != '//') return null;
+		const match = code.match(/^\/\/(.+?)(\n|$)/);
+		if (!match) return null;
+		const comment = match[0];
+		return {
+			html: `<span class="comment">${escape(comment)}</span>`,
+			next: comment.length
+		};
+	},
+
+	// block comment
+	code => {
+		const match = code.match(/^\/\*([\s\S]+?)\*\//);
+		if (!match) return null;
+		return {
+			html: `<span class="comment">${escape(match[0])}</span>`,
+			next: match[0].length
+		};
+	},
+
+	// string
+	code => {
+		if (!/^['"`]/.test(code)) return null;
+		const begin = code[0];
+		let str = begin;
+		let thisIsNotAString = false;
+		for (let i = 1; i < code.length; i++) {
+			const char = code[i];
+			if (char == '\\') {
+				str += char;
+				str += code[i + 1] || '';
+				i++;
+				continue;
+			} else if (char == begin) {
+				str += char;
+				break;
+			} else if (char == '\n' || i == (code.length - 1)) {
+				thisIsNotAString = true;
+				break;
+			} else {
+				str += char;
+			}
+		}
+		if (thisIsNotAString) {
+			return null;
+		} else {
+			return {
+				html: `<span class="string">${escape(str)}</span>`,
+				next: str.length
+			};
+		}
+	},
+
+	// regexp
+	code => {
+		if (code[0] != '/') return null;
+		let regexp = '';
+		let thisIsNotARegexp = false;
+		for (let i = 1; i < code.length; i++) {
+			const char = code[i];
+			if (char == '\\') {
+				regexp += char;
+				regexp += code[i + 1] || '';
+				i++;
+				continue;
+			} else if (char == '/') {
+				break;
+			} else if (char == '\n' || i == (code.length - 1)) {
+				thisIsNotARegexp = true;
+				break;
+			} else {
+				regexp += char;
+			}
+		}
+
+		if (thisIsNotARegexp) return null;
+		if (regexp == '') return null;
+		if (regexp[0] == ' ' && regexp[regexp.length - 1] == ' ') return null;
+
+		return {
+			html: `<span class="regexp">/${escape(regexp)}/</span>`,
+			next: regexp.length + 2
+		};
+	},
+
+	// label
+	code => {
+		if (code[0] != '@') return null;
+		const match = code.match(/^@([a-zA-Z_-]+?)\n/);
+		if (!match) return null;
+		const label = match[0];
+		return {
+			html: `<span class="label">${label}</span>`,
+			next: label.length
+		};
+	},
+
+	// number
+	(code, i, source) => {
+		const prev = source[i - 1];
+		if (prev && /[a-zA-Z]/.test(prev)) return null;
+		if (!/^[\-\+]?[0-9\.]+/.test(code)) return null;
+		const match = code.match(/^[\-\+]?[0-9\.]+/)[0];
+		if (match) {
+			return {
+				html: `<span class="number">${match}</span>`,
+				next: match.length
+			};
+		} else {
+			return null;
+		}
+	},
+
+	// nan
+	(code, i, source) => {
+		const prev = source[i - 1];
+		if (prev && /[a-zA-Z]/.test(prev)) return null;
+		if (code.substr(0, 3) == 'NaN') {
+			return {
+				html: `<span class="nan">NaN</span>`,
+				next: 3
+			};
+		} else {
+			return null;
+		}
+	},
+
+	// method
+	code => {
+		const match = code.match(/^([a-zA-Z_-]+?)\(/);
+		if (!match) return null;
+
+		if (match[1] == '-') return null;
+
+		return {
+			html: `<span class="method">${match[1]}</span>`,
+			next: match[1].length
+		};
+	},
+
+	// property
+	(code, i, source) => {
+		const prev = source[i - 1];
+		if (prev != '.') return null;
+
+		const match = code.match(/^[a-zA-Z0-9_-]+/);
+		if (!match) return null;
+
+		return {
+			html: `<span class="property">${match[0]}</span>`,
+			next: match[0].length
+		};
+	},
+
+	// keyword
+	(code, i, source) => {
+		const prev = source[i - 1];
+		if (prev && /[a-zA-Z]/.test(prev)) return null;
+
+		const match = keywords.filter(k => code.substr(0, k.length) == k)[0];
+		if (match) {
+			if (/^[a-zA-Z]/.test(code.substr(match.length))) return null;
+			return {
+				html: `<span class="keyword ${match}">${match}</span>`,
+				next: match.length
+			};
+		} else {
+			return null;
+		}
+	},
+
+	// symbol
+	code => {
+		const match = symbols.filter(s => code[0] == s)[0];
+		if (match) {
+			return {
+				html: `<span class="symbol">${match}</span>`,
+				next: 1
+			};
+		} else {
+			return null;
+		}
+	}
+];
+
+// specify lang is todo
+export default (source: string, lang?: string) => {
+	let code = source;
+	let html = '';
+
+	let i = 0;
+
+	function push(token: Token) {
+		html += token.html;
+		code = code.substr(token.next);
+		i += token.next;
+	}
+
+	while (code != '') {
+		const parsed = elements.some(el => {
+			const e = el(code, i, source);
+			if (e) {
+				push(e);
+				return true;
+			} else {
+				return false;
+			}
+		});
+
+		if (!parsed) {
+			push({
+				html: escape(code[0]),
+				next: 1
+			});
+		}
+	}
+
+	return html;
+};
diff --git a/src/mfm/parse/elements/bold.ts b/src/mfm/parse/elements/bold.ts
new file mode 100644
index 0000000000..cf615cd3cc
--- /dev/null
+++ b/src/mfm/parse/elements/bold.ts
@@ -0,0 +1,20 @@
+/**
+ * Bold
+ */
+
+export type TextElementBold = {
+	type: 'bold'
+	content: string
+	bold: string
+};
+
+export default function(text: string) {
+	const match = text.match(/^\*\*(.+?)\*\*/);
+	if (!match) return null;
+	const bold = match[0];
+	return {
+		type: 'bold',
+		content: bold,
+		bold: bold.substr(2, bold.length - 4)
+	} as TextElementBold;
+}
diff --git a/src/mfm/parse/elements/code.ts b/src/mfm/parse/elements/code.ts
new file mode 100644
index 0000000000..f48e945048
--- /dev/null
+++ b/src/mfm/parse/elements/code.ts
@@ -0,0 +1,24 @@
+/**
+ * Code (block)
+ */
+
+import genHtml from '../core/syntax-highlighter';
+
+export type TextElementCode = {
+	type: 'code'
+	content: string
+	code: string
+	html: string
+};
+
+export default function(text: string) {
+	const match = text.match(/^```([\s\S]+?)```/);
+	if (!match) return null;
+	const code = match[0];
+	return {
+		type: 'code',
+		content: code,
+		code: code.substr(3, code.length - 6).trim(),
+		html: genHtml(code.substr(3, code.length - 6).trim())
+	} as TextElementCode;
+}
diff --git a/src/mfm/parse/elements/emoji.ts b/src/mfm/parse/elements/emoji.ts
new file mode 100644
index 0000000000..83d3effef5
--- /dev/null
+++ b/src/mfm/parse/elements/emoji.ts
@@ -0,0 +1,20 @@
+/**
+ * Emoji
+ */
+
+export type TextElementEmoji = {
+	type: 'emoji'
+	content: string
+	emoji: string
+};
+
+export default function(text: string) {
+	const match = text.match(/^:[a-zA-Z0-9+-_]+:/);
+	if (!match) return null;
+	const emoji = match[0];
+	return {
+		type: 'emoji',
+		content: emoji,
+		emoji: emoji.substr(1, emoji.length - 2)
+	} as TextElementEmoji;
+}
diff --git a/src/mfm/parse/elements/hashtag.ts b/src/mfm/parse/elements/hashtag.ts
new file mode 100644
index 0000000000..129041774f
--- /dev/null
+++ b/src/mfm/parse/elements/hashtag.ts
@@ -0,0 +1,25 @@
+/**
+ * Hashtag
+ */
+
+export type TextElementHashtag = {
+	type: 'hashtag'
+	content: string
+	hashtag: string
+};
+
+export default function(text: string, i: number) {
+	if (!(/^\s#[^\s]+/.test(text) || (i == 0 && /^#[^\s]+/.test(text)))) return null;
+	const isHead = text[0] == '#';
+	const hashtag = text.match(/^\s?#[^\s]+/)[0];
+	const res: any[] = !isHead ? [{
+		type: 'text',
+		content: text[0]
+	}] : [];
+	res.push({
+		type: 'hashtag',
+		content: isHead ? hashtag : hashtag.substr(1),
+		hashtag: isHead ? hashtag.substr(1) : hashtag.substr(2)
+	});
+	return res as TextElementHashtag[];
+}
diff --git a/src/mfm/parse/elements/inline-code.ts b/src/mfm/parse/elements/inline-code.ts
new file mode 100644
index 0000000000..1dd5affa51
--- /dev/null
+++ b/src/mfm/parse/elements/inline-code.ts
@@ -0,0 +1,24 @@
+/**
+ * Code (inline)
+ */
+
+import genHtml from '../core/syntax-highlighter';
+
+export type TextElementInlineCode = {
+	type: 'inline-code'
+	content: string
+	code: string
+	html: string
+};
+
+export default function(text: string) {
+	const match = text.match(/^`(.+?)`/);
+	if (!match) return null;
+	const code = match[0];
+	return {
+		type: 'inline-code',
+		content: code,
+		code: code.substr(1, code.length - 2).trim(),
+		html: genHtml(code.substr(1, code.length - 2).trim())
+	} as TextElementInlineCode;
+}
diff --git a/src/mfm/parse/elements/link.ts b/src/mfm/parse/elements/link.ts
new file mode 100644
index 0000000000..b353aebc5c
--- /dev/null
+++ b/src/mfm/parse/elements/link.ts
@@ -0,0 +1,27 @@
+/**
+ * Link
+ */
+
+export type TextElementLink = {
+	type: 'link'
+	content: string
+	title: string
+	url: string
+	silent: boolean
+};
+
+export default function(text: string) {
+	const match = text.match(/^\??\[([^\[\]]+?)\]\((https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.=\+\-]+?)\)/);
+	if (!match) return null;
+	const silent = text[0] == '?';
+	const link = match[0];
+	const title = match[1];
+	const url = match[2];
+	return {
+		type: 'link',
+		content: link,
+		title: title,
+		url: url,
+		silent: silent
+	} as TextElementLink;
+}
diff --git a/src/mfm/parse/elements/mention.ts b/src/mfm/parse/elements/mention.ts
new file mode 100644
index 0000000000..eda60b530a
--- /dev/null
+++ b/src/mfm/parse/elements/mention.ts
@@ -0,0 +1,24 @@
+/**
+ * Mention
+ */
+import parseAcct from '../../../acct/parse';
+
+export type TextElementMention = {
+	type: 'mention'
+	content: string
+	username: string
+	host: string
+};
+
+export default function(text: string) {
+	const match = text.match(/^@[a-z0-9_]+(?:@[a-z0-9\.\-]+[a-z0-9])?/i);
+	if (!match) return null;
+	const mention = match[0];
+	const { username, host } = parseAcct(mention.substr(1));
+	return {
+		type: 'mention',
+		content: mention,
+		username,
+		host
+	} as TextElementMention;
+}
diff --git a/src/mfm/parse/elements/quote.ts b/src/mfm/parse/elements/quote.ts
new file mode 100644
index 0000000000..bef9ad4988
--- /dev/null
+++ b/src/mfm/parse/elements/quote.ts
@@ -0,0 +1,20 @@
+/**
+ * Quoted text
+ */
+
+export type TextElementQuote = {
+	type: 'quote'
+	content: string
+	quote: string
+};
+
+export default function(text: string) {
+	const match = text.match(/^"([\s\S]+?)\n"/);
+	if (!match) return null;
+	const quote = match[0];
+	return {
+		type: 'quote',
+		content: quote,
+		quote: quote.substr(1, quote.length - 2).trim(),
+	} as TextElementQuote;
+}
diff --git a/src/mfm/parse/elements/search.ts b/src/mfm/parse/elements/search.ts
new file mode 100644
index 0000000000..e5d9b9f0c2
--- /dev/null
+++ b/src/mfm/parse/elements/search.ts
@@ -0,0 +1,19 @@
+/**
+ * Search
+ */
+
+export type TextElementSearch = {
+	type: 'search'
+	content: string
+	query: string
+};
+
+export default function(text: string) {
+	const match = text.match(/^(.+?) 検索(\n|$)/);
+	if (!match) return null;
+	return {
+		type: 'search',
+		content: match[0],
+		query: match[1]
+	};
+}
diff --git a/src/mfm/parse/elements/title.ts b/src/mfm/parse/elements/title.ts
new file mode 100644
index 0000000000..b89739a7c5
--- /dev/null
+++ b/src/mfm/parse/elements/title.ts
@@ -0,0 +1,20 @@
+/**
+ * Title
+ */
+
+export type TextElementTitle = {
+	type: 'title'
+	content: string
+	title: string
+};
+
+export default function(text: string) {
+	const match = text.match(/^【(.+?)】\n/);
+	if (!match) return null;
+	const title = match[0];
+	return {
+		type: 'title',
+		content: title,
+		title: title.substr(1, title.length - 3)
+	} as TextElementTitle;
+}
diff --git a/src/mfm/parse/elements/url.ts b/src/mfm/parse/elements/url.ts
new file mode 100644
index 0000000000..78b9b1f2f1
--- /dev/null
+++ b/src/mfm/parse/elements/url.ts
@@ -0,0 +1,20 @@
+/**
+ * URL
+ */
+
+export type TextElementUrl = {
+	type: 'url'
+	content: string
+	url: string
+};
+
+export default function(text: string) {
+	const match = text.match(/^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.=\+\-]+/);
+	if (!match) return null;
+	const url = match[0];
+	return {
+		type: 'url',
+		content: url,
+		url: url
+	} as TextElementUrl;
+}
diff --git a/src/mfm/parse/index.ts b/src/mfm/parse/index.ts
new file mode 100644
index 0000000000..2b6a459b1e
--- /dev/null
+++ b/src/mfm/parse/index.ts
@@ -0,0 +1,99 @@
+/**
+ * Misskey Text Analyzer
+ */
+
+import { TextElementBold } from './elements/bold';
+import { TextElementCode } from './elements/code';
+import { TextElementEmoji } from './elements/emoji';
+import { TextElementHashtag } from './elements/hashtag';
+import { TextElementInlineCode } from './elements/inline-code';
+import { TextElementLink } from './elements/link';
+import { TextElementMention } from './elements/mention';
+import { TextElementQuote } from './elements/quote';
+import { TextElementSearch } from './elements/search';
+import { TextElementTitle } from './elements/title';
+import { TextElementUrl } from './elements/url';
+
+const elements = [
+	require('./elements/bold'),
+	require('./elements/title'),
+	require('./elements/url'),
+	require('./elements/link'),
+	require('./elements/mention'),
+	require('./elements/hashtag'),
+	require('./elements/code'),
+	require('./elements/inline-code'),
+	require('./elements/quote'),
+	require('./elements/emoji'),
+	require('./elements/search')
+].map(element => element.default as TextElementProcessor);
+
+export type TextElement = { type: 'text', content: string }
+	| TextElementBold
+	| TextElementCode
+	| TextElementEmoji
+	| TextElementHashtag
+	| TextElementInlineCode
+	| TextElementLink
+	| TextElementMention
+	| TextElementQuote
+	| TextElementSearch
+	| TextElementTitle
+	| TextElementUrl;
+export type TextElementProcessor = (text: string, i: number) => TextElement | TextElement[];
+
+export default (source: string): TextElement[] => {
+
+	if (source == '') {
+		return null;
+	}
+
+	const tokens: TextElement[] = [];
+
+	function push(token: TextElement) {
+		if (token != null) {
+			tokens.push(token);
+			source = source.substr(token.content.length);
+		}
+	}
+
+	let i = 0;
+
+	// パース
+	while (source != '') {
+		const parsed = elements.some(el => {
+			let _tokens = el(source, i);
+			if (_tokens) {
+				if (!Array.isArray(_tokens)) {
+					_tokens = [_tokens];
+				}
+				_tokens.forEach(push);
+				return true;
+			} else {
+				return false;
+			}
+		});
+
+		if (!parsed) {
+			push({
+				type: 'text',
+				content: source[0]
+			});
+		}
+
+		i++;
+	}
+
+	// テキストを纏める
+	return tokens.reduce((a, b) => {
+		if (a.length && a[a.length - 1].type == 'text' && b.type == 'text') {
+			const tail = a.pop();
+			return a.concat({
+				type: 'text',
+				content: tail.content + b.content
+			});
+		} else {
+			return a.concat(b);
+		}
+	}, [] as TextElement[]);
+};
diff --git a/src/remote/activitypub/misc/get-note-html.ts b/src/remote/activitypub/misc/get-note-html.ts
index 0ceecdd00b..8df440930b 100644
--- a/src/remote/activitypub/misc/get-note-html.ts
+++ b/src/remote/activitypub/misc/get-note-html.ts
@@ -1,6 +1,6 @@
 import { INote } from '../../../models/note';
-import toHtml from '../../../text/html';
-import parse from '../../../text/parse';
+import toHtml from '../../../mfm/html';
+import parse from '../../../mfm/parse';
 import config from '../../../config';
 
 export default function(note: INote) {
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts
index b0fe045e6d..85a8f89bc8 100644
--- a/src/remote/activitypub/models/note.ts
+++ b/src/remote/activitypub/models/note.ts
@@ -1,5 +1,4 @@
 import * as mongo from 'mongodb';
-const parse5 = require('parse5');
 import * as debug from 'debug';
 
 import config from '../../../config';
@@ -10,79 +9,10 @@ import { INote as INoteActivityStreamsObject, IObject } from '../type';
 import { resolvePerson, updatePerson } from './person';
 import { resolveImage } from './image';
 import { IRemoteUser, IUser } from '../../../models/user';
+import htmlToMFM from '../../../mfm/html-to-mfm';
 
 const log = debug('misskey:activitypub');
 
-function parse(html: string): string {
-	const dom = parse5.parseFragment(html);
-
-	let text = '';
-
-	dom.childNodes.forEach((n: any) => analyze(n));
-
-	return text.trim();
-
-	function getText(node: any) {
-		if (node.nodeName == '#text') return node.value;
-
-		if (node.childNodes) {
-			return node.childNodes.map((n: any) => getText(n)).join('');
-		}
-
-		return '';
-	}
-
-	function analyze(node: any) {
-		switch (node.nodeName) {
-			case '#text':
-				text += node.value;
-				break;
-
-			case 'br':
-				text += '\n';
-				break;
-
-			case 'a':
-				const txt = getText(node);
-
-				// メンション
-				if (txt.startsWith('@')) {
-					const part = txt.split('@');
-
-					if (part.length == 2) {
-						//#region ホスト名部分が省略されているので復元する
-						const href = new URL(node.attrs.find((x: any) => x.name == 'href').value);
-						const acct = txt + '@' + href.hostname;
-						text += acct;
-						break;
-						//#endregion
-					} else if (part.length == 3) {
-						text += txt;
-						break;
-					}
-				}
-
-				if (node.childNodes) {
-					node.childNodes.forEach((n: any) => analyze(n));
-				}
-				break;
-
-			case 'p':
-				text += '\n\n';
-				if (node.childNodes) {
-					node.childNodes.forEach((n: any) => analyze(n));
-				}
-				break;
-
-			default:
-				if (node.childNodes) {
-					node.childNodes.forEach((n: any) => analyze(n));
-				}
-				break;
-		}
-	}
-}
-
 /**
  * Noteをフェッチします。
  *
@@ -158,7 +88,7 @@ export async function createNote(value: any, resolver?: Resolver, silent = false
 	const reply = note.inReplyTo ? await resolveNote(note.inReplyTo, resolver) : null;
 
 	// テキストのパース
-	const text = parse(note.content);
+	const text = htmlToMFM(note.content);
 
 	// ユーザーの情報が古かったらついでに更新しておく
 	if (actor.updatedAt == null || Date.now() - actor.updatedAt.getTime() > 1000 * 60 * 60 * 24) {
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
index 42ee5a27df..f233346395 100644
--- a/src/remote/activitypub/models/person.ts
+++ b/src/remote/activitypub/models/person.ts
@@ -1,5 +1,4 @@
 import * as mongo from 'mongodb';
-import { JSDOM } from 'jsdom';
 import { toUnicode } from 'punycode';
 import * as debug from 'debug';
 
@@ -11,6 +10,7 @@ import { resolveImage } from './image';
 import { isCollectionOrOrderedCollection, IObject, IPerson } from '../type';
 import { IDriveFile } from '../../../models/drive-file';
 import Meta from '../../../models/meta';
+import htmlToMFM from '../../../mfm/html-to-mfm';
 
 const log = debug('misskey:activitypub');
 
@@ -80,7 +80,6 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
 	]);
 
 	const host = toUnicode(finger.subject.replace(/^.*?@/, '')).toLowerCase();
-	const summaryDOM = JSDOM.fragment(person.summary);
 
 	// Create user
 	let user: IRemoteUser;
@@ -89,7 +88,7 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
 			avatarId: null,
 			bannerId: null,
 			createdAt: Date.parse(person.published) || null,
-			description: summaryDOM.textContent,
+			description: htmlToMFM(person.summary),
 			followersCount,
 			followingCount,
 			notesCount,
@@ -211,8 +210,6 @@ export async function updatePerson(value: string | IObject, resolver?: Resolver)
 		)
 	]);
 
-	const summaryDOM = JSDOM.fragment(person.summary);
-
 	// アイコンとヘッダー画像をフェッチ
 	const [avatar, banner] = (await Promise.all<IDriveFile>([
 		person.icon,
@@ -231,7 +228,7 @@ export async function updatePerson(value: string | IObject, resolver?: Resolver)
 			bannerId: banner ? banner._id : null,
 			avatarUrl: avatar && avatar.metadata.isMetaOnly ? avatar.metadata.url : null,
 			bannerUrl: banner && banner.metadata.isMetaOnly ? banner.metadata.url : null,
-			description: summaryDOM.textContent,
+			description: htmlToMFM(person.summary),
 			followersCount,
 			followingCount,
 			notesCount,
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index ef03c4e044..782ac5a4fe 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -14,7 +14,7 @@ import watch from './watch';
 import Mute from '../../models/mute';
 import pushSw from '../../publishers/push-sw';
 import event from '../../publishers/stream';
-import parse from '../../text/parse';
+import parse from '../../mfm/parse';
 import { IApp } from '../../models/app';
 import UserList from '../../models/user-list';
 import resolveUser from '../../remote/resolve-user';
diff --git a/src/text/html.ts b/src/text/html.ts
deleted file mode 100644
index 64208af88b..0000000000
--- a/src/text/html.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-const { lib: emojilib } = require('emojilib');
-import { JSDOM } from 'jsdom';
-import config from '../config';
-import { INote } from '../models/note';
-import { TextElement } from './parse';
-
-const handlers: { [key: string]: (window: any, token: any, mentionedRemoteUsers: INote['mentionedRemoteUsers']) => void } = {
-	bold({ document }, { bold }) {
-		const b = document.createElement('b');
-		b.textContent = bold;
-		document.body.appendChild(b);
-	},
-
-	code({ document }, { code }) {
-		const pre = document.createElement('pre');
-		const inner = document.createElement('code');
-		inner.innerHTML = code;
-		pre.appendChild(inner);
-		document.body.appendChild(pre);
-	},
-
-	emoji({ document }, { content, emoji }) {
-		const found = emojilib[emoji];
-		const node = document.createTextNode(found ? found.char : content);
-		document.body.appendChild(node);
-	},
-
-	hashtag({ document }, { hashtag }) {
-		const a = document.createElement('a');
-		a.href = config.url + '/tags/' + hashtag;
-		a.textContent = '#' + hashtag;
-		a.setAttribute('rel', 'tag');
-		document.body.appendChild(a);
-	},
-
-	'inline-code'({ document }, { code }) {
-		const element = document.createElement('code');
-		element.textContent = code;
-		document.body.appendChild(element);
-	},
-
-	link({ document }, { url, title }) {
-		const a = document.createElement('a');
-		a.href = url;
-		a.textContent = title;
-		document.body.appendChild(a);
-	},
-
-	mention({ document }, { content, username, host }, mentionedRemoteUsers) {
-		const a = document.createElement('a');
-		const remoteUserInfo = mentionedRemoteUsers.find(remoteUser => remoteUser.username === username && remoteUser.host === host);
-		a.href = remoteUserInfo ? remoteUserInfo.uri : `${config.url}/${content}`;
-		a.textContent = content;
-		document.body.appendChild(a);
-	},
-
-	quote({ document }, { quote }) {
-		const blockquote = document.createElement('blockquote');
-		blockquote.textContent = quote;
-		document.body.appendChild(blockquote);
-	},
-
-	title({ document }, { content }) {
-		const h1 = document.createElement('h1');
-		h1.textContent = content;
-		document.body.appendChild(h1);
-	},
-
-	text({ document }, { content }) {
-		for (const text of content.split('\n')) {
-			const node = document.createTextNode(text);
-			document.body.appendChild(node);
-
-			const br = document.createElement('br');
-			document.body.appendChild(br);
-		}
-	},
-
-	url({ document }, { url }) {
-		const a = document.createElement('a');
-		a.href = url;
-		a.textContent = url;
-		document.body.appendChild(a);
-	},
-
-	search({ document }, { content, query }) {
-		const a = document.createElement('a');
-		a.href = `https://www.google.com/?#q=${query}`;
-		a.textContent = content;
-		document.body.appendChild(a);
-	}
-};
-
-export default (tokens: TextElement[], mentionedRemoteUsers: INote['mentionedRemoteUsers'] = []) => {
-	const { window } = new JSDOM('');
-
-	for (const token of tokens) {
-		handlers[token.type](window, token, mentionedRemoteUsers);
-	}
-
-	return `<p>${window.document.body.innerHTML}</p>`;
-};
diff --git a/src/text/parse/core/syntax-highlighter.ts b/src/text/parse/core/syntax-highlighter.ts
deleted file mode 100644
index 3fb7a3b73d..0000000000
--- a/src/text/parse/core/syntax-highlighter.ts
+++ /dev/null
@@ -1,341 +0,0 @@
-function escape(text: string) {
-	return text
-		.replace(/>/g, '&gt;')
-		.replace(/</g, '&lt;');
-}
-
-// 文字数が多い順にソートします
-// そうしないと、「function」という文字列が与えられたときに「func」が先にマッチしてしまう可能性があるためです
-const _keywords = [
-	'true',
-	'false',
-	'null',
-	'nil',
-	'undefined',
-	'void',
-	'var',
-	'const',
-	'let',
-	'mut',
-	'dim',
-	'if',
-	'then',
-	'else',
-	'switch',
-	'match',
-	'case',
-	'default',
-	'for',
-	'each',
-	'in',
-	'while',
-	'loop',
-	'continue',
-	'break',
-	'do',
-	'goto',
-	'next',
-	'end',
-	'sub',
-	'throw',
-	'try',
-	'catch',
-	'finally',
-	'enum',
-	'delegate',
-	'function',
-	'func',
-	'fun',
-	'fn',
-	'return',
-	'yield',
-	'async',
-	'await',
-	'require',
-	'include',
-	'import',
-	'imports',
-	'export',
-	'exports',
-	'from',
-	'as',
-	'using',
-	'use',
-	'internal',
-	'module',
-	'namespace',
-	'where',
-	'select',
-	'struct',
-	'union',
-	'new',
-	'delete',
-	'this',
-	'super',
-	'base',
-	'class',
-	'interface',
-	'abstract',
-	'static',
-	'public',
-	'private',
-	'protected',
-	'virtual',
-	'partial',
-	'override',
-	'extends',
-	'implements',
-	'constructor'
-];
-
-const keywords = _keywords
-	.concat(_keywords.map(k => k[0].toUpperCase() + k.substr(1)))
-	.concat(_keywords.map(k => k.toUpperCase()))
-	.sort((a, b) => b.length - a.length);
-
-const symbols = [
-	'=',
-	'+',
-	'-',
-	'*',
-	'/',
-	'%',
-	'~',
-	'^',
-	'&',
-	'|',
-	'>',
-	'<',
-	'!',
-	'?'
-];
-
-type Token = {
-	html: string
-	next: number
-};
-
-type Element = (code: string, i: number, source: string) => (Token | null);
-
-const elements: Element[] = [
-	// comment
-	code => {
-		if (code.substr(0, 2) != '//') return null;
-		const match = code.match(/^\/\/(.+?)(\n|$)/);
-		if (!match) return null;
-		const comment = match[0];
-		return {
-			html: `<span class="comment">${escape(comment)}</span>`,
-			next: comment.length
-		};
-	},
-
-	// block comment
-	code => {
-		const match = code.match(/^\/\*([\s\S]+?)\*\//);
-		if (!match) return null;
-		return {
-			html: `<span class="comment">${escape(match[0])}</span>`,
-			next: match[0].length
-		};
-	},
-
-	// string
-	code => {
-		if (!/^['"`]/.test(code)) return null;
-		const begin = code[0];
-		let str = begin;
-		let thisIsNotAString = false;
-		for (let i = 1; i < code.length; i++) {
-			const char = code[i];
-			if (char == '\\') {
-				str += char;
-				str += code[i + 1] || '';
-				i++;
-				continue;
-			} else if (char == begin) {
-				str += char;
-				break;
-			} else if (char == '\n' || i == (code.length - 1)) {
-				thisIsNotAString = true;
-				break;
-			} else {
-				str += char;
-			}
-		}
-		if (thisIsNotAString) {
-			return null;
-		} else {
-			return {
-				html: `<span class="string">${escape(str)}</span>`,
-				next: str.length
-			};
-		}
-	},
-
-	// regexp
-	code => {
-		if (code[0] != '/') return null;
-		let regexp = '';
-		let thisIsNotARegexp = false;
-		for (let i = 1; i < code.length; i++) {
-			const char = code[i];
-			if (char == '\\') {
-				regexp += char;
-				regexp += code[i + 1] || '';
-				i++;
-				continue;
-			} else if (char == '/') {
-				break;
-			} else if (char == '\n' || i == (code.length - 1)) {
-				thisIsNotARegexp = true;
-				break;
-			} else {
-				regexp += char;
-			}
-		}
-
-		if (thisIsNotARegexp) return null;
-		if (regexp == '') return null;
-		if (regexp[0] == ' ' && regexp[regexp.length - 1] == ' ') return null;
-
-		return {
-			html: `<span class="regexp">/${escape(regexp)}/</span>`,
-			next: regexp.length + 2
-		};
-	},
-
-	// label
-	code => {
-		if (code[0] != '@') return null;
-		const match = code.match(/^@([a-zA-Z_-]+?)\n/);
-		if (!match) return null;
-		const label = match[0];
-		return {
-			html: `<span class="label">${label}</span>`,
-			next: label.length
-		};
-	},
-
-	// number
-	(code, i, source) => {
-		const prev = source[i - 1];
-		if (prev && /[a-zA-Z]/.test(prev)) return null;
-		if (!/^[\-\+]?[0-9\.]+/.test(code)) return null;
-		const match = code.match(/^[\-\+]?[0-9\.]+/)[0];
-		if (match) {
-			return {
-				html: `<span class="number">${match}</span>`,
-				next: match.length
-			};
-		} else {
-			return null;
-		}
-	},
-
-	// nan
-	(code, i, source) => {
-		const prev = source[i - 1];
-		if (prev && /[a-zA-Z]/.test(prev)) return null;
-		if (code.substr(0, 3) == 'NaN') {
-			return {
-				html: `<span class="nan">NaN</span>`,
-				next: 3
-			};
-		} else {
-			return null;
-		}
-	},
-
-	// method
-	code => {
-		const match = code.match(/^([a-zA-Z_-]+?)\(/);
-		if (!match) return null;
-
-		if (match[1] == '-') return null;
-
-		return {
-			html: `<span class="method">${match[1]}</span>`,
-			next: match[1].length
-		};
-	},
-
-	// property
-	(code, i, source) => {
-		const prev = source[i - 1];
-		if (prev != '.') return null;
-
-		const match = code.match(/^[a-zA-Z0-9_-]+/);
-		if (!match) return null;
-
-		return {
-			html: `<span class="property">${match[0]}</span>`,
-			next: match[0].length
-		};
-	},
-
-	// keyword
-	(code, i, source) => {
-		const prev = source[i - 1];
-		if (prev && /[a-zA-Z]/.test(prev)) return null;
-
-		const match = keywords.filter(k => code.substr(0, k.length) == k)[0];
-		if (match) {
-			if (/^[a-zA-Z]/.test(code.substr(match.length))) return null;
-			return {
-				html: `<span class="keyword ${match}">${match}</span>`,
-				next: match.length
-			};
-		} else {
-			return null;
-		}
-	},
-
-	// symbol
-	code => {
-		const match = symbols.filter(s => code[0] == s)[0];
-		if (match) {
-			return {
-				html: `<span class="symbol">${match}</span>`,
-				next: 1
-			};
-		} else {
-			return null;
-		}
-	}
-];
-
-// specify lang is todo
-export default (source: string, lang?: string) => {
-	let code = source;
-	let html = '';
-
-	let i = 0;
-
-	function push(token: Token) {
-		html += token.html;
-		code = code.substr(token.next);
-		i += token.next;
-	}
-
-	while (code != '') {
-		const parsed = elements.some(el => {
-			const e = el(code, i, source);
-			if (e) {
-				push(e);
-				return true;
-			} else {
-				return false;
-			}
-		});
-
-		if (!parsed) {
-			push({
-				html: escape(code[0]),
-				next: 1
-			});
-		}
-	}
-
-	return html;
-};
diff --git a/src/text/parse/elements/bold.ts b/src/text/parse/elements/bold.ts
deleted file mode 100644
index cf615cd3cc..0000000000
--- a/src/text/parse/elements/bold.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Bold
- */
-
-export type TextElementBold = {
-	type: 'bold'
-	content: string
-	bold: string
-};
-
-export default function(text: string) {
-	const match = text.match(/^\*\*(.+?)\*\*/);
-	if (!match) return null;
-	const bold = match[0];
-	return {
-		type: 'bold',
-		content: bold,
-		bold: bold.substr(2, bold.length - 4)
-	} as TextElementBold;
-}
diff --git a/src/text/parse/elements/code.ts b/src/text/parse/elements/code.ts
deleted file mode 100644
index f48e945048..0000000000
--- a/src/text/parse/elements/code.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Code (block)
- */
-
-import genHtml from '../core/syntax-highlighter';
-
-export type TextElementCode = {
-	type: 'code'
-	content: string
-	code: string
-	html: string
-};
-
-export default function(text: string) {
-	const match = text.match(/^```([\s\S]+?)```/);
-	if (!match) return null;
-	const code = match[0];
-	return {
-		type: 'code',
-		content: code,
-		code: code.substr(3, code.length - 6).trim(),
-		html: genHtml(code.substr(3, code.length - 6).trim())
-	} as TextElementCode;
-}
diff --git a/src/text/parse/elements/emoji.ts b/src/text/parse/elements/emoji.ts
deleted file mode 100644
index 83d3effef5..0000000000
--- a/src/text/parse/elements/emoji.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Emoji
- */
-
-export type TextElementEmoji = {
-	type: 'emoji'
-	content: string
-	emoji: string
-};
-
-export default function(text: string) {
-	const match = text.match(/^:[a-zA-Z0-9+-_]+:/);
-	if (!match) return null;
-	const emoji = match[0];
-	return {
-		type: 'emoji',
-		content: emoji,
-		emoji: emoji.substr(1, emoji.length - 2)
-	} as TextElementEmoji;
-}
diff --git a/src/text/parse/elements/hashtag.ts b/src/text/parse/elements/hashtag.ts
deleted file mode 100644
index 129041774f..0000000000
--- a/src/text/parse/elements/hashtag.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Hashtag
- */
-
-export type TextElementHashtag = {
-	type: 'hashtag'
-	content: string
-	hashtag: string
-};
-
-export default function(text: string, i: number) {
-	if (!(/^\s#[^\s]+/.test(text) || (i == 0 && /^#[^\s]+/.test(text)))) return null;
-	const isHead = text[0] == '#';
-	const hashtag = text.match(/^\s?#[^\s]+/)[0];
-	const res: any[] = !isHead ? [{
-		type: 'text',
-		content: text[0]
-	}] : [];
-	res.push({
-		type: 'hashtag',
-		content: isHead ? hashtag : hashtag.substr(1),
-		hashtag: isHead ? hashtag.substr(1) : hashtag.substr(2)
-	});
-	return res as TextElementHashtag[];
-}
diff --git a/src/text/parse/elements/inline-code.ts b/src/text/parse/elements/inline-code.ts
deleted file mode 100644
index 1dd5affa51..0000000000
--- a/src/text/parse/elements/inline-code.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Code (inline)
- */
-
-import genHtml from '../core/syntax-highlighter';
-
-export type TextElementInlineCode = {
-	type: 'inline-code'
-	content: string
-	code: string
-	html: string
-};
-
-export default function(text: string) {
-	const match = text.match(/^`(.+?)`/);
-	if (!match) return null;
-	const code = match[0];
-	return {
-		type: 'inline-code',
-		content: code,
-		code: code.substr(1, code.length - 2).trim(),
-		html: genHtml(code.substr(1, code.length - 2).trim())
-	} as TextElementInlineCode;
-}
diff --git a/src/text/parse/elements/link.ts b/src/text/parse/elements/link.ts
deleted file mode 100644
index b353aebc5c..0000000000
--- a/src/text/parse/elements/link.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Link
- */
-
-export type TextElementLink = {
-	type: 'link'
-	content: string
-	title: string
-	url: string
-	silent: boolean
-};
-
-export default function(text: string) {
-	const match = text.match(/^\??\[([^\[\]]+?)\]\((https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.=\+\-]+?)\)/);
-	if (!match) return null;
-	const silent = text[0] == '?';
-	const link = match[0];
-	const title = match[1];
-	const url = match[2];
-	return {
-		type: 'link',
-		content: link,
-		title: title,
-		url: url,
-		silent: silent
-	} as TextElementLink;
-}
diff --git a/src/text/parse/elements/mention.ts b/src/text/parse/elements/mention.ts
deleted file mode 100644
index eda60b530a..0000000000
--- a/src/text/parse/elements/mention.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Mention
- */
-import parseAcct from '../../../acct/parse';
-
-export type TextElementMention = {
-	type: 'mention'
-	content: string
-	username: string
-	host: string
-};
-
-export default function(text: string) {
-	const match = text.match(/^@[a-z0-9_]+(?:@[a-z0-9\.\-]+[a-z0-9])?/i);
-	if (!match) return null;
-	const mention = match[0];
-	const { username, host } = parseAcct(mention.substr(1));
-	return {
-		type: 'mention',
-		content: mention,
-		username,
-		host
-	} as TextElementMention;
-}
diff --git a/src/text/parse/elements/quote.ts b/src/text/parse/elements/quote.ts
deleted file mode 100644
index bef9ad4988..0000000000
--- a/src/text/parse/elements/quote.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Quoted text
- */
-
-export type TextElementQuote = {
-	type: 'quote'
-	content: string
-	quote: string
-};
-
-export default function(text: string) {
-	const match = text.match(/^"([\s\S]+?)\n"/);
-	if (!match) return null;
-	const quote = match[0];
-	return {
-		type: 'quote',
-		content: quote,
-		quote: quote.substr(1, quote.length - 2).trim(),
-	} as TextElementQuote;
-}
diff --git a/src/text/parse/elements/search.ts b/src/text/parse/elements/search.ts
deleted file mode 100644
index e5d9b9f0c2..0000000000
--- a/src/text/parse/elements/search.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Search
- */
-
-export type TextElementSearch = {
-	type: 'search'
-	content: string
-	query: string
-};
-
-export default function(text: string) {
-	const match = text.match(/^(.+?) 検索(\n|$)/);
-	if (!match) return null;
-	return {
-		type: 'search',
-		content: match[0],
-		query: match[1]
-	};
-}
diff --git a/src/text/parse/elements/title.ts b/src/text/parse/elements/title.ts
deleted file mode 100644
index b89739a7c5..0000000000
--- a/src/text/parse/elements/title.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Title
- */
-
-export type TextElementTitle = {
-	type: 'title'
-	content: string
-	title: string
-};
-
-export default function(text: string) {
-	const match = text.match(/^【(.+?)】\n/);
-	if (!match) return null;
-	const title = match[0];
-	return {
-		type: 'title',
-		content: title,
-		title: title.substr(1, title.length - 3)
-	} as TextElementTitle;
-}
diff --git a/src/text/parse/elements/url.ts b/src/text/parse/elements/url.ts
deleted file mode 100644
index 78b9b1f2f1..0000000000
--- a/src/text/parse/elements/url.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * URL
- */
-
-export type TextElementUrl = {
-	type: 'url'
-	content: string
-	url: string
-};
-
-export default function(text: string) {
-	const match = text.match(/^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.=\+\-]+/);
-	if (!match) return null;
-	const url = match[0];
-	return {
-		type: 'url',
-		content: url,
-		url: url
-	} as TextElementUrl;
-}
diff --git a/src/text/parse/index.ts b/src/text/parse/index.ts
deleted file mode 100644
index 2b6a459b1e..0000000000
--- a/src/text/parse/index.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Misskey Text Analyzer
- */
-
-import { TextElementBold } from './elements/bold';
-import { TextElementCode } from './elements/code';
-import { TextElementEmoji } from './elements/emoji';
-import { TextElementHashtag } from './elements/hashtag';
-import { TextElementInlineCode } from './elements/inline-code';
-import { TextElementLink } from './elements/link';
-import { TextElementMention } from './elements/mention';
-import { TextElementQuote } from './elements/quote';
-import { TextElementSearch } from './elements/search';
-import { TextElementTitle } from './elements/title';
-import { TextElementUrl } from './elements/url';
-
-const elements = [
-	require('./elements/bold'),
-	require('./elements/title'),
-	require('./elements/url'),
-	require('./elements/link'),
-	require('./elements/mention'),
-	require('./elements/hashtag'),
-	require('./elements/code'),
-	require('./elements/inline-code'),
-	require('./elements/quote'),
-	require('./elements/emoji'),
-	require('./elements/search')
-].map(element => element.default as TextElementProcessor);
-
-export type TextElement = { type: 'text', content: string }
-	| TextElementBold
-	| TextElementCode
-	| TextElementEmoji
-	| TextElementHashtag
-	| TextElementInlineCode
-	| TextElementLink
-	| TextElementMention
-	| TextElementQuote
-	| TextElementSearch
-	| TextElementTitle
-	| TextElementUrl;
-export type TextElementProcessor = (text: string, i: number) => TextElement | TextElement[];
-
-export default (source: string): TextElement[] => {
-
-	if (source == '') {
-		return null;
-	}
-
-	const tokens: TextElement[] = [];
-
-	function push(token: TextElement) {
-		if (token != null) {
-			tokens.push(token);
-			source = source.substr(token.content.length);
-		}
-	}
-
-	let i = 0;
-
-	// パース
-	while (source != '') {
-		const parsed = elements.some(el => {
-			let _tokens = el(source, i);
-			if (_tokens) {
-				if (!Array.isArray(_tokens)) {
-					_tokens = [_tokens];
-				}
-				_tokens.forEach(push);
-				return true;
-			} else {
-				return false;
-			}
-		});
-
-		if (!parsed) {
-			push({
-				type: 'text',
-				content: source[0]
-			});
-		}
-
-		i++;
-	}
-
-	// テキストを纏める
-	return tokens.reduce((a, b) => {
-		if (a.length && a[a.length - 1].type == 'text' && b.type == 'text') {
-			const tail = a.pop();
-			return a.concat({
-				type: 'text',
-				content: tail.content + b.content
-			});
-		} else {
-			return a.concat(b);
-		}
-	}, [] as TextElement[]);
-};
-- 
cgit v1.2.3-freya