From edd712b6ba3f1bea55a235192cac24346d15a914 Mon Sep 17 00:00:00 2001
From: cutls <cutls>
Date: Fri, 10 Aug 2018 00:18:35 +0900
Subject: [PATCH] TheDesk Akane (16.0.4)

---
 README.md                 | 11 +++++------
 app/css/tl.css            |  6 +++++-
 app/index.sample.html     | 12 +++++++++---
 app/js/tl/misskeyparse.js | 15 +++++++++++++++
 app/js/tl/mix.js          | 37 +++++++++++++++++++++++++------------
 app/js/tl/notification.js | 25 +++++++++++++++++++++++--
 app/js/tl/parse.js        | 11 ++++-------
 app/js/tl/tl.js           |  6 +++++-
 app/js/ui/layout.js       | 29 +++++++++++++++++++++++++----
 app/package-lock.json     |  4 ++--
 app/package.json          | 28 +++++++++++++++-------------
 11 files changed, 133 insertions(+), 51 deletions(-)

diff --git a/README.md b/README.md
index 041c4f91..fdb86f88 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
 # TheDesk
+
 Mastodon/Misskey client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドン/MisskeyのWindows/Linuxクライアント  
 Download:[TheDesk](https://thedesk.top)  
@@ -28,7 +29,6 @@ You cannot PR? You can also write Issues.
 該当箇所がわからない場合はIssuesに書いてください.  
 他言語も大歓迎です！  
 
-
 ## Component/構成
 
 app:Raw files(you can download to modify or check)  
@@ -40,8 +40,7 @@ desk.icns: macOS向けアイコン.セルフビルドにどうぞ.
 
 ## Requirement/環境
 
-- Windows (to launch TheDesk/実行に必要) / Linux (x64/ia32/armv7l)
-- Electron 2.0.5
+- Electron 2.0.7
 - electron-dl
 - Jimp
 - adm-zip
@@ -62,11 +61,11 @@ Misskey(misskey.xyz)のトークンは含まれておりません。
   
 electron-packager is required. electron-packagerが必要です.  
 Windows  
-`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=2.0.5 --icon=.\app\thedesk.ico --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --win32metadata.CompanyName="TheDesk&Cutls.com" --win32metadata.FileDescription="TheDesk" --win32metadata.OriginalFilename="TheDesk" --win32metadata.InternalName="TheDesk" --win32metadata.ProductName="TheDesk" --platform=win32 --arch=all --electron-version=2.0.7 --icon=.\app\thedesk.ico --overwrite`  
 Linux  
-`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=2.0.5 --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=2.0.7 --overwrite`  
 macOS  
-`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=2.0.5 --icon=./app/icon.icns --overwrite`  
+`electron-packager ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2018 Cutls.com 2015 All Right Reserved" --platform=darwin --arch=all --electron-version=2.0.7 --icon=./app/icon.icns --overwrite`  
 
 ## See also/詳しく
 
diff --git a/app/css/tl.css b/app/css/tl.css
index 68f4ee28..bebcd069 100644
--- a/app/css/tl.css
+++ b/app/css/tl.css
@@ -348,9 +348,13 @@ p:not(:last-child){
   min-height: 100px;
   max-height: 500px;
 }
+.column-hide{
+  display:none;
+  overflow:hidden;
+  height:0;
+}
 .notf-indv-box {
   width:100%;
-  min-height: 100px;
   max-height: 400px;
   overflow-y: scroll;
   overflow-x: hidden;
diff --git a/app/index.sample.html b/app/index.sample.html
index 51aa4682..76822799 100644
--- a/app/index.sample.html
+++ b/app/index.sample.html
@@ -26,7 +26,7 @@
 <script type="text/javascript" src="./js/common/modal.js"></script>
 <script type="text/javascript" src="./js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Akane (16.0.3)";
+var ver="Akane (16.0.4)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -521,14 +521,20 @@ var lang="{{lang}}";
 		<h3>TheDesk</h3>
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br><br>
-			<div id="release-Akane_16-0-3" style="display:none">
-				<h5>Release Note Akane (16.0.3)</h5>
+			<div id="release-Akane_16-0-4" style="display:none">
+				<h5>Release Note Akane (16.0.4)</h5>
 					<b>Mio->AkaneアップデートでTLが表示できなくなったユーザー様へ</b><br>
 					16.0.1で設定のインポート/エクスポートを実装いたしました。<br>
 					設定より一度エクスポートしていただき、もう一度インポートすることにより正常に動作すると思われます。<br>
 					<u>開発環境でこのバグが再現できなかったため、あくまでも憶測による対処です。</u><br>
 					<br>
 					ご迷惑をおかけいたしましたことを深くお詫び申し上げます。<br>
+					16.0.4<br>
+					<ul>
+						<li>一部ロケールを追加</li>
+						<li>Misskeyの一部修正</li>
+						<li>アニメーションの変更</li>
+					</ul>
 					16.0.3<br>
 					<ul>
 						<li>Misskey周りの改善</li>
diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js
index 14c09353..583e17eb 100644
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -152,6 +152,21 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 					"pudding":"🍮"
 				}
 				var icon=reactions[toot.reaction];
+				var reactions=["like","love","laugh","hmm","surprise","congrats","angry","confused","pudding"];
+                for(var i=0;i<reactions.length;i++){
+                    if(toot.note.reactionCounts[reactions[i]]){
+                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
+                        $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+                    }else{
+                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(0)
+                        if($("#pub_" + id +" .reactions").hasClass("fullreact")){
+                            $("#pub_" + id +" .re-"+reactions[i]).addClass("hide")
+                        }else{
+                            $("#pub_" + id +" .re-"+reactions[i]).removeClass("hide")
+                        }
+                        $("#pub_" + id +" .re-"+reactions[i]+"ct").text(toot.note.reactionCounts[reactions[i]])
+                    }
+                }
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.createdAt,
 				'absolute') + '('+lang_parse_notftime[lang]+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
diff --git a/app/js/tl/mix.js b/app/js/tl/mix.js
index 90137564..837bf6ee 100644
--- a/app/js/tl/mix.js
+++ b/app/js/tl/mix.js
@@ -114,21 +114,28 @@ function mixre(acct_id, tlid, TLtype, mute,delc) {
 
 		} else if (type == "update") {
 			var templete = parse([obj], '', acct_id, tlid,"",mute);
-			if (!$("#timeline_"+tlid+" [toot-id="+obj.id+"]").length) {
+			if($("#timeline_" + tlid +" [toot-id=" + obj.id + "]").length < 1){
+				if(voice){
+					say(obj.content)
+				}	
+				var templete = parse([obj], type, acct_id, tlid,"",mute);
 				var pool = localStorage.getItem("pool_" + tlid);
-				if (pool && templete) {
+				if (pool) {
 					pool = templete + pool;
-				} else if (templete) {
+				} else {
 					pool = templete
-				}else{
-					pool="";
 				}
 				localStorage.setItem("pool_" + tlid, pool);
+	
 				scrollck();
+	
 				additional(acct_id, tlid);
 				jQuery("time.timeago").timeago();
-				todc();
-		}}
+			}else{
+				todo("二重取得発生中");
+			}
+
+			}
 	}
 	websocketHome[wshid].onmessage = function(mess) {
 		console.log("Receive Streaming API:(Integrated:Home)");
@@ -154,19 +161,25 @@ function mixre(acct_id, tlid, TLtype, mute,delc) {
 					var templete="";
 				}
 			}
-		if (!$("#timeline_"+tlid+" [toot-id="+obj.id+"]").length) {
+			if($("#timeline_" + tlid +" [toot-id=" + obj.id + "]").length < 1){
+				if(voice){
+					say(obj.content)
+				}	
+				var templete = parse([obj], type, acct_id, tlid,"",mute);
 				var pool = localStorage.getItem("pool_" + tlid);
-				if (pool && templete) {
+				if (pool) {
 					pool = templete + pool;
-				} else if (templete) {
+				} else {
 					pool = templete
-				}else{
-					pool="";
 				}
 				localStorage.setItem("pool_" + tlid, pool);
+	
 				scrollck();
+	
 				additional(acct_id, tlid);
 				jQuery("time.timeago").timeago();
+			}else{
+				todo("二重取得発生中");
 			}
 		}
 	}
diff --git a/app/js/tl/notification.js b/app/js/tl/notification.js
index bb34093a..b5722d6a 100644
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@@ -239,8 +239,29 @@ function notfmore(tlid) {
 
 //通知トグルボタン
 function notfToggle(acct, tlid) {
-	$("#notf-box_" + tlid).toggleClass("hide");
-	$("#notf-box_" + tlid).toggleClass("show");
+	if($("#notf-box_" + tlid).hasClass("column-hide")){
+		$("#notf-box_" + tlid).css("display","block")
+		$("#notf-box_" + tlid).animate({
+			'height': '400px'
+		},{
+			'duration': 300,
+			'complete': function(){
+				$("#notf-box_" + tlid).css("overflow-y","scroll")
+				$("#notf-box_" + tlid).removeClass("column-hide")
+			}
+		});
+	}else{
+		$("#notf-box_" + tlid).css("overflow-y","hidden")
+		$("#notf-box_" + tlid).animate({
+			'height': '0'
+		},{
+			'duration': 300,
+			'complete': function(){
+				$("#notf-box_" + tlid).addClass("column-hide")
+				$("#notf-box_" + tlid).css("display","none")
+			}
+		});
+	}
 	notfCanceler(acct)
 }
 function notfCanceler(acct){
diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index a988d838..6d25df1e 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -549,9 +549,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'('+lang_parse_clickcopyurl[lang]+')"><i class="fa fa-clock-o"></i>' +
 			date(toot.created_at, datetype) + '</span>' +
 			'</div></div>' +
-			'<div class="area-toot"><span class="toot ' + spoiler + '">' + content +
-			'</span><span class="' +
+			'<div class="area-toot"><span class="' +
 			api_spoil + ' cw_text_' + toot.id + '">' + spoil + spoiler_show +
+			'</span><span class="toot ' + spoiler + '">' + content +
 			'</span>' +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
@@ -605,7 +605,6 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 
 //オブジェクトパーサー(ユーザーデータ)
 function userparse(obj, auth, acct_id, tlid, popup) {
-	console.log("notf-get")
 	//独自ロケール
 	var locale = localStorage.getItem("locale");
 	if(locale=="yes"){
@@ -616,6 +615,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	Object.keys(obj).forEach(function(key) {
 		var toot = obj[key];
 		if(!toot.username){
+			var raw=toot;
 			toot=toot.account;
 			var notf=true;
 		}else{
@@ -637,10 +637,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			ftxt = localStorage.getItem("follow_" + acct_id);
 		}
 		if(popup > 0 || popup==-1 || notf){
-			var notftext='<span class="cbadge" title="' + date(toot.created_at,
-				'absolute') + '('+lang_parse_notftime[lang]+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,
-				datetype) +
-			'</span>'+ftxt+'<br>';
+			var notftext=ftxt+'<br>';
 		}else{
 			var notftext="";
 		}
diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js
index c335f29b..97014349 100644
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@@ -485,7 +485,11 @@ function cap(type, data, acct_id) {
 	} else if (type == "dm") {
 		var response= "DM"
 	} else if (type == "mix") {
-		var response= "Integrated"
+		if(localStorage.getItem("domain_" + acct_id)=="misskey.xyz"){
+			var response= "Social TL"
+		}else{
+			var response= "Integrated"
+		}
 	} else if (type == "plus") {
 		var response= "Local+"
 	}
diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js
index d5277420..adeef2df 100644
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -119,9 +119,9 @@ function parseColumn() {
 						  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang_layout_delthis[lang]+'"'+icnsert+'>cancel</i></a></div>'+
 		  '<div class="area-a3"><a onclick="setToggle(' + key +
 		  ')" class="setting nex" title="'+lang_layout_setthis[lang]+'"'+icnsert+'><i class="material-icons waves-effect nex">settings</i></a></div></div>'+
-		  '<div class="hide notf-indv-box z-depth-4" id="notf-box_' + key +
+		  '<div class="column-hide notf-indv-box z-depth-4" id="notf-box_' + key +
 		  '"><div id="notifications_' + key +
-		  '" data-notf="' + acct.domain + '" data-type="notf"></div></div><div class="hide notf-indv-box" id="util-box_' + key +
+		  '" data-notf="' + acct.domain + '" data-type="notf"></div></div><div class="column-hide notf-indv-box" id="util-box_' + key +
 		  '" style="padding:5px;"><a onclick="mediaToggle(' + key +
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang_layout_mediafil[lang]+'">perm_media</i><span id="sta-media-' +
 		  key + '">On</span></a>'+lang_layout_mediafil[lang]+'<br><a onclick="cardToggle(' + key +
@@ -254,8 +254,29 @@ function removeColumn(tlid) {
 //設定トグル
 function setToggle(tlid) {
 	colorpicker(tlid);
-	$("#util-box_" + tlid).toggleClass("hide");
-	$("#util-box_" + tlid).toggleClass("show");
+	if($("#util-box_" + tlid).hasClass("column-hide")){
+		$("#util-box_" + tlid).css("display","block")
+		$("#util-box_" + tlid).animate({
+			'height': '200px'
+		},{
+			'duration': 300,
+			'complete': function(){
+				$("#util-box_" + tlid).css("overflow-y","scroll")
+				$("#util-box_" + tlid).removeClass("column-hide")
+			}
+		});
+	}else{
+		$("#util-box_" + tlid).css("overflow-y","hidden")
+		$("#util-box_" + tlid).animate({
+			'height': '0'
+		},{
+			'duration': 300,
+			'complete': function(){
+				$("#util-box_" + tlid).addClass("column-hide")
+				$("#util-box_" + tlid).css("display","none")
+			}
+		});
+	}
 }
 function colorpicker(key){
 	temp=
diff --git a/app/package-lock.json b/app/package-lock.json
index eee08a4e..b410e18a 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "TheDesk",
-  "version": "15.10.0",
+  "name": "thedesk",
+  "version": "16.0.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/app/package.json b/app/package.json
index 380a6d66..e63a97c3 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,27 +1,29 @@
 {
   "name": "thedesk",
-  "version": "16.0.3",
+  "version": "16.0.4",
   "description": "TheDesk is a Mastodon client for PC.",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "keywords": [],
-  "bugs":{ 
-    "url" : "https://github.com/cutls/TheDesk/issues",
-    "email" : "mstdn@thedesk.top"
+  "bugs": {
+    "url": "https://github.com/cutls/TheDesk/issues",
+    "email": "mstdn@thedesk.top"
   },
-  "homepage":"https://thedesk.top",
-  "author": { 
+  "homepage": "https://thedesk.top",
+  "author": {
     "name": "Cutls P",
-    "url" : "https://kirishima.clooud/@Cutls",
-    "email" : "web-pro@cutls.com"
+    "url": "https://kirishima.clooud/@Cutls",
+    "email": "web-pro@cutls.com"
   },
-  "contributor": [{ 
-    "name": "とねぢ",
-    "url" : "https://minohdon.jp/@toneji",
-    "email" : "solfa.tono@gmail.com"
-  }],
+  "contributor": [
+    {
+      "name": "とねぢ",
+      "url": "https://minohdon.jp/@toneji",
+      "email": "solfa.tono@gmail.com"
+    }
+  ],
   "license": "TheDesk LICENSE",
   "dependencies": {
     "adm-zip": "^0.4.11",