From f19d95a2a6af11e2a5baac51dc557261b62fad86 Mon Sep 17 00:00:00 2001
From: cutls <cutls>
Date: Thu, 10 May 2018 01:01:06 +0900
Subject: [PATCH] TheDesk Mio (ver.1[fixed])

---
 app/index.html            |  2 +-
 app/js/post/use-txtbox.js |  1 +
 app/js/tl/parse.js        | 18 ++++++++++++++++++
 app/package.json          |  2 +-
 ver.json                  |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/index.html b/app/index.html
index f553310f..c27e69ec 100644
--- a/app/index.html
+++ b/app/index.html
@@ -26,7 +26,7 @@
 <script type="text/javascript" src="./js/ui/jquery-ui.min.js"></script>
 <script>
 	//必ずアプデ時のremove instance消して！
-var ver="Mio (ver.1)";
+var ver="Mio (ver.1[fixed])";
 //betaを入れるとバージョンチェックしない
 //var ver="beta";
 var acct_id=0;
diff --git a/app/js/post/use-txtbox.js b/app/js/post/use-txtbox.js
index 1ef001a5..5a14a0fc 100644
--- a/app/js/post/use-txtbox.js
+++ b/app/js/post/use-txtbox.js
@@ -6,6 +6,7 @@ function re(id,at,acct_id,mode){
 	$("#textarea").val("@"+at+" "+te);
 	$("#rec").text("はい");
 	$("#post-acct-sel").val(acct_id);
+	$("#post-acct-sel").prop("disabled", true);
 	$('select').material_select();
 	$("#textarea").attr("placeholder","返信モードです。クリアするときはCtrl+Shift+Cを押してください。");
 	$("#textarea").focus();
diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index c6f8b489..9bc8d68c 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -136,6 +136,7 @@ function parse(obj, mix, acct_id, tlid, popup) {
 					'" class="emoji-img" data-emoji="'+shortcode+'">';
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				dis_name = dis_name.replace(regExp, emoji_url);
+				
 			});
 		}
 		if (mix == "notf") {
@@ -211,6 +212,23 @@ function parse(obj, mix, acct_id, tlid, popup) {
 					")"+rebtxt+"<br>";
 					var boostback = "shared";
 				var toot = toot.reblog;
+				var dis_name=escapeHTML(toot.account.display_name);
+				if(toot.account.emojis){
+					var actemojick = toot.account.emojis[0];
+				}else{
+					var actemojick=false;
+				}
+			//絵文字があれば
+			if (actemojick) {
+				Object.keys(toot.account.emojis).forEach(function(key5) {
+					var emoji = toot.account.emojis[key5];
+					var shortcode = emoji.shortcode;
+					var emoji_url = '<img src="' + emoji.url +
+						'" class="emoji-img" data-emoji="'+shortcode+'">';
+					var regExp = new RegExp(":" + shortcode + ":", "g");
+					dis_name = dis_name.replace(regExp, emoji_url);
+				});
+			}
 			} else {
 				var notice = "";
 				var boostback = "";
diff --git a/app/package.json b/app/package.json
index aabca4f7..18d8b0dc 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TheDesk",
-  "version": "15.1.0",
+  "version": "15.1.1",
   "description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです",
   "main": "main.js",
   "scripts": {
diff --git a/ver.json b/ver.json
index a077f7cd..32e15719 100644
--- a/ver.json
+++ b/ver.json
@@ -1 +1 @@
-{"warn":"これはGCPにアップして下さい！！","warn2":"これはGCPにアップして下さい！！","warn3":"これはGCPにアップして下さい！！","desk":"Mio (ver.1)","date":"2018-05-10","detail":"内部V:15.1.0|Adobeフォトエディタ/UI変更"}
\ No newline at end of file
+{"warn":"これはGCPにアップして下さい！！","warn2":"これはGCPにアップして下さい！！","warn3":"これはGCPにアップして下さい！！","desk":"Mio (ver.1[fixed])","date":"2018-05-10","detail":"内部V:15.1.0|Adobeフォトエディタ/UI変更"}
\ No newline at end of file