From 67df681a48935e83669ae6522a35e5ccc4005f60 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 22 Nov 2018 01:51:26 +0900
Subject: [PATCH] Refactoring
---
src/client/app/common/views/components/mfm.ts | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/client/app/common/views/components/mfm.ts b/src/client/app/common/views/components/mfm.ts
index b7ff5bd487..e93ea5ccba 100644
--- a/src/client/app/common/views/components/mfm.ts
+++ b/src/client/app/common/views/components/mfm.ts
@@ -9,18 +9,18 @@ import MkGoogle from './google.vue';
import { toUnicode } from 'punycode';
import syntaxHighlight from '../../../../../mfm/syntax-highlight';
-function getText(tokens: Node[]): string {
- let text = '';
+function getTextCount(tokens: Node[]): number {
+ let count = 0;
const extract = (tokens: Node[]) => {
tokens.filter(x => x.name === 'text').forEach(x => {
- text += x.props.text;
+ count += length(x.props.text);
});
tokens.filter(x => x.children).forEach(x => {
extract(x.children);
});
};
extract(tokens);
- return text;
+ return count;
}
function getChildrenCount(tokens: Node[]): number {
@@ -98,7 +98,7 @@ export default Vue.component('misskey-flavored-markdown', {
case 'big': {
bigCount++;
- const isLong = length(getText(token.children)) > 10 || getChildrenCount(token.children) > 5;
+ const isLong = getTextCount(token.children) > 10 || getChildrenCount(token.children) > 5;
const isMany = bigCount > 3;
return (createElement as any)('strong', {
attrs: {
@@ -113,7 +113,7 @@ export default Vue.component('misskey-flavored-markdown', {
case 'motion': {
motionCount++;
- const isLong = length(getText(token.children)) > 10 || getChildrenCount(token.children) > 5;
+ const isLong = getTextCount(token.children) > 10 || getChildrenCount(token.children) > 5;
const isMany = motionCount > 3;
return (createElement as any)('span', {
attrs: {