From 8e663391b9cef0a913f89ac620f885b1653d1c60 Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Mon, 11 Nov 2019 01:20:51 +0900
Subject: [PATCH] For grapheme cluster compt

---
 app/js/platform/first.js | 34 +++++++++++-----------------------
 app/js/tl/parse.js       |  4 +++-
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/app/js/platform/first.js b/app/js/platform/first.js
index 20aca529..565382e6 100644
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -152,33 +152,21 @@ $.isSurrogatePear = function(upper, lower) {
 	return 0xd800 <= upper && upper <= 0xdbff && 0xdc00 <= lower && lower <= 0xdfff
 }
 $.mb_strlen = function(str) {
-	var ret = 0
-	for (var i = 0; i < str.length; i++, ret++) {
-		var upper = str.charCodeAt(i)
-		var lower = str.length > i + 1 ? str.charCodeAt(i + 1) : 0
-		if ($.isSurrogatePear(upper, lower)) {
-			i++
-		}
-	}
-	return ret
+	var splitter = new GraphemeSplitter()
+	var arr = splitter.splitGraphemes(str)
+	return arr.length
 }
 $.mb_substr = function(str, begin, end) {
-	var ret = ''
-	for (var i = 0, len = 0; i < str.length; i++, len++) {
-		var upper = str.charCodeAt(i)
-		var lower = str.length > i + 1 ? str.charCodeAt(i + 1) : 0
-		var s = ''
-		if ($.isSurrogatePear(upper, lower)) {
-			i++
-			s = String.fromCharCode(upper, lower)
-		} else {
-			s = String.fromCharCode(upper)
-		}
-		if (begin <= len && len < end) {
-			ret += s
+	//配列にする
+	var splitter = new GraphemeSplitter()
+	var arr = splitter.splitGraphemes(str)
+	var newarr = []
+	for(var i = 0; i < arr.length; i++){
+		if(i >= begin && i <= end){
+			newarr.push(arr[i])
 		}
 	}
-	return ret
+	return newarr.join('')
 }
 //ソートするやつ
 function object_array_sort(data, key, order, fn) {
diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index ebfdf0cf..00e78e2a 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -1,5 +1,6 @@
 //オブジェクトパーサー(トゥート)
 function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
+	var splitter = new GraphemeSplitter()
 	var templete = ''
 	if (obj[0]) {
 		if (tlid === 1) {
@@ -500,9 +501,10 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				} else {
 					var ct = ct2
 				}
+
 				if (
 					(sent < ct && $.mb_strlen($.strip_tags(content)) > 5) ||
-					($.strip_tags(content).length > ltr && $.mb_strlen($.strip_tags(content)) > 5)
+					($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5)
 				) {
 					var content = `<span class="gray">${lang.lang_parse_fulltext}</span><br>` + content
 					var spoil = `<span class="cw-long-${toot.id}">${$.mb_substr(