From 103fe8b91de036613425ec5d39e5c21c38a6a0ee Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 27 Jan 2019 19:32:35 +0900
Subject: [MFM] Resolve #4009

---
 src/client/app/common/views/components/mfm.ts |  9 ++++++++-
 src/mfm/parser.ts                             | 13 +++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/client/app/common/views/components/mfm.ts b/src/client/app/common/views/components/mfm.ts
index 542f1e34c5..1cf7752cbd 100644
--- a/src/client/app/common/views/components/mfm.ts
+++ b/src/client/app/common/views/components/mfm.ts
@@ -128,9 +128,16 @@ export default Vue.component('misskey-flavored-markdown', {
 					motionCount++;
 					const isLong = sumTextsLength(token.children) > 5 || countNodesF(token.children) > 3;
 					const isMany = motionCount > 3;
+					const direction =
+						token.node.props.attr == 'left' ? 'reverse' :
+						token.node.props.attr == 'alternate' ? 'alternate' :
+						'normal';
+					const style = (this.$store.state.settings.disableAnimatedMfm || isLong || isMany)
+						? ''
+						: `animation: spin 1.5s linear infinite; animation-direction: ${direction};`;
 					return (createElement as any)('span', {
 						attrs: {
-							style: (this.$store.state.settings.disableAnimatedMfm || isLong || isMany) ? 'display: inline-block;' : 'display: inline-block; animation: spin 1.5s linear infinite;'
+							style: 'display: inline-block;' + style
 						},
 					}, genEl(token.children));
 				}
diff --git a/src/mfm/parser.ts b/src/mfm/parser.ts
index 6b7c3c5845..3c917f8d07 100644
--- a/src/mfm/parser.ts
+++ b/src/mfm/parser.ts
@@ -148,12 +148,21 @@ const mfm = P.createLanguage({
 
 	//#region Spin
 	spin: r =>
-		P.regexp(/<spin>(.+?)<\/spin>/, 1)
+		P((input, i) => {
+			const text = input.substr(i);
+			const match = text.match(/^<spin(\s[a-z]+?)?>(.+?)<\/spin>/i);
+			if (!match) return P.makeFailure(i, 'not a spin');
+			return P.makeSuccess(i + match[0].length, {
+				content: match[2], attr: match[1] ? match[1].trim() : null
+			});
+		})
 		.map(x => createTree('spin', P.alt(
 			r.emoji,
 			r.flip,
 			r.text
-		).atLeast(1).tryParse(x), {})),
+		).atLeast(1).tryParse(x.content), {
+			attr: x.attr
+		})),
 	//#endregion
 
 	//#region Jump
-- 
cgit v1.2.3-freya