From cf587c76e6b0234902010f38986d3b4a0451e07c Mon Sep 17 00:00:00 2001
From: cutls <cutls>
Date: Wed, 29 Aug 2018 19:17:34 +0900
Subject: [PATCH] TheDesk Akane (16.0.11)

---
 app/index.sample.html     | 12 ++++++++----
 app/js/common/version.js  |  2 ++
 app/js/login/login.js     |  2 +-
 app/js/tl/card.js         | 14 +++++++-------
 app/js/tl/filter.js       | 11 +++++++++--
 app/js/tl/list.js         |  2 +-
 app/js/tl/misskeyparse.js |  4 +++-
 app/js/ui/settings.js     |  8 +++++++-
 app/js/ui/spotify.js      |  9 ++++++---
 app/js/ui/tips.js         |  5 +++--
 app/package.json          |  2 +-
 11 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/app/index.sample.html b/app/index.sample.html
index b2a3631f..dd856859 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.10)";
+var ver="Akane (16.0.11)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -522,12 +522,16 @@ var lang="{{lang}}";
 		<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-10" style="display:none">
+			<div id="release-Akane_16-0-11" style="display:none">
 					<a href="https://code.cutls.com/thedesk-log/" target="_blank">開発の経緯</a><br>
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 					Entyでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。
-				<h5>Release Note Akane (16.0.10)</h5>
-					16.0.9<br>
+				<h5>Release Note Akane (16.0.11)</h5>
+					16.0.11<br>
+					<ul>
+						<li>様々なバグを修正</li>
+					</ul>
+					16.0.10<br>
 					<ul>
 						<li>自動CWに関する不具合</li>
 						<li>アップデートに関する不具合</li>
diff --git a/app/js/common/version.js b/app/js/common/version.js
index d07b25c4..ad0574ad 100644
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@@ -168,6 +168,8 @@ function verck(ver) {
 				Materialize.toast(obj.text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
 			}
 		}
+	}else{
+		$("#persons").text(obj.text);
 	}
 	}
 	infows.onerror = function(error) {
diff --git a/app/js/login/login.js b/app/js/login/login.js
index 1b58fe55..89cf31bc 100644
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@@ -382,7 +382,7 @@ function ckdb(acct_id) {
 				localStorage.setItem("follow_" + acct_id, json[domain + "_follow"]);
 			}
 	}
-	if(localStorage.getItem("mode_" + domain)=="misskey"){
+	if(localStorage.getItem("mode_" + domain)!="misskey"){
 		var start = "https://" + domain + "/api/v1/instance/activity";
 		fetch(start, {
 			method: 'GET',
diff --git a/app/js/tl/card.js b/app/js/tl/card.js
index f432452c..df7d3f88 100644
--- a/app/js/tl/card.js
+++ b/app/js/tl/card.js
@@ -95,12 +95,12 @@ function additional(acct_id, tlid) {
 							var twiImg='';
 						}
 						$("[toot-id=" + id + "] .additional").html(
-							'<blockquote class="twitter-tweet"><b>'+json.author_name+'</b><br>'+json.description+twiImg+'</blockquote>');
+							'<blockquote class="twitter-tweet"><b>'+escapeHTML(json.author_name)+'</b><br>'+escapeHTML(json.description)+twiImg+'</blockquote>');
 					}
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang_cards_check[lang]+":<br>Title:" + json.title + "<br>" +
-							json.description + "</span>");
+							"<span class=\"gray\">URL"+lang_cards_check[lang]+":<br>Title:" + escapeHTML(json.title) + "<br>" +
+							escapeHTML(json.description) + "</span>");
 					}
 					if (json.html) {
 						$("[toot-id=" + id + "] .additional").html(json.html+'<i class="material-icons" onclick="pip('+id+')" title="'+lang_cards_pip[lang]+'">picture_in_picture_alt</i>');
@@ -221,7 +221,7 @@ function additionalIndv(tlid, acct_id, id) {
 							var twiImg='';
 						}
 						$("[toot-id=" + id + "] .additional").html(
-							'<div class="twitter-tweet"><b>'+json.author_name+'</b><br>'+json.description+twiImg+'</div>');
+							'<div class="twitter-tweet"><b>'+escapeHTML(json.author_name)+'</b><br>'+escapeHTML(json.description)+twiImg+'</div>');
 					}else if (json.provider_name=="pixiv"){	
 						if(json.image){
 							var pxvImg='<br><img src="'+json.image+'" style="max-width:100%" onclick="imgv(\'pixiv_'+id+'\', 0, \'pixiv\');" id="pixiv_'+id+'-image-0" data-url="'+json.embed_url+'" data-type="image">';
@@ -229,12 +229,12 @@ function additionalIndv(tlid, acct_id, id) {
 							var pxvImg='';
 						}
 						$("[toot-id=" + id + "] .additional").html(
-							'<div class="pixiv-post"><b><a href="'+json.author_url+'" target="_blank">'+json.author_name+'</a></b><br>'+json.title+pxvImg+'</div>');
+							'<div class="pixiv-post"><b><a href="'+json.author_url+'" target="_blank">'+escapeHTML(json.author_name)+'</a></b><br>'+escapeHTML(json.title)+pxvImg+'</div>');
 					}else{
 						if (json.title) {
 							$("[toot-id=" + id + "] .additional").html(
-								"<span class=\"gray\">URL"+lang_cards_check[lang]+":<br>Title:" + json.title + "<br>" +
-								json.description + "</span>");
+								"<span class=\"gray\">URL"+lang_cards_check[lang]+":<br>Title:" + escapeHTML(json.title) + "<br>" +
+								escapeHTML(json.description) + "</span>");
 						}
 						if (json.html) {
 							$("[toot-id=" + id + "] .additional").html(json.html+'<i class="material-icons sml pointer" onclick="pip(\''+id+'\')" title="'+lang_cards_pip[lang]+'">picture_in_picture_alt</i>');
diff --git a/app/js/tl/filter.js b/app/js/tl/filter.js
index 62cfa5a8..1ee5b67b 100644
--- a/app/js/tl/filter.js
+++ b/app/js/tl/filter.js
@@ -96,7 +96,7 @@ function filter(){
 			Object.keys(json).forEach(function(key) {
 				var filterword = json[key];
 				var context = filterword.context.join(',');
-				filters = filters + filterword.phrase+'<span class="sml">(for '+context+')</span>:<a onclick="filterEdit(\'' + filterword.id + '\',\'' + acct_id +
+				filters = filters + escapeHTML(filterword.phrase)+'<span class="sml">(for '+context+')</span>:<a onclick="filterEdit(\'' + filterword.id + '\',\'' + acct_id +
 					'\')" class="pointer">'+lang_edit[lang]+'</a>/<a onclick="filterDel(' + filterword.id + ',' + acct_id +
 					')" class="pointer">'+lang_del[lang]+'</a><br> ';
 			});
@@ -131,6 +131,9 @@ function makeNewFilter(){
 	}
 	var exc=$("#except_filter:checked").val();
 	var who=$("#wholeword_filter:checked").val();
+	if(!who){
+		who=false;
+	}
 	var time=$("#days_filter").val()*24*60*60+$("#hours_filter").val()*60*60+$("#mins_filter").val()*60;
     var domain = localStorage.getItem("domain_" + acct_id);
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
@@ -249,7 +252,8 @@ function filterDel(id,acct_id){
 }
 function getFilter(acct_id){
     var domain = localStorage.getItem("domain_" + acct_id);
-    var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+	if(localStorage.getItem("mode_" + domain)!="misskey"){
     var start = "https://" + domain + "/api/v1/filters"
 	console.log(start)
 	fetch(start, {
@@ -266,6 +270,9 @@ function getFilter(acct_id){
 	}).then(function(json) {
 		localStorage.setItem("filter_"+ acct_id ,JSON.stringify(json));
 	});
+	}else{
+		localStorage.setItem("filter_"+ acct_id ,JSON.stringify({}));
+	}
 }
 function getFilterType(json,type){
 	if(!json){
diff --git a/app/js/tl/list.js b/app/js/tl/list.js
index 8885c04b..bd810b85 100644
--- a/app/js/tl/list.js
+++ b/app/js/tl/list.js
@@ -123,7 +123,7 @@ function hisList(user,acct_id){
 			Object.keys(json).forEach(function(key) {
                 var list = json[key];
 				lists = lists + '<a onclick="listAdd(' + list.id + ',\'' + user + '\',\'' + acct_id +
-					'\')" class="pointer">'+list.title+'</a><br> ';
+					'\')" class="pointer">'+escapeHTML(list.title)+'</a><br> ';
 			});
 			$("#his-lists-a").html(lists);
 		}else{
diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js
index c2c38dd8..a894930a 100644
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -128,7 +128,9 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         var dis_name=toot.user.name;
         if(dis_name){
             dis_name=escapeHTML(dis_name);
-        }
+        }else{
+			disname="";
+		}
 		if (mix == "notf") {
 			if (gif == "yes") {
 				noticeavatar = toot.user.avatarUrl;
diff --git a/app/js/ui/settings.js b/app/js/ui/settings.js
index ab2c14a2..90991121 100644
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@@ -519,7 +519,12 @@ function exportSettings(){
 		exp.wordMute=wordmu;
 		//spotify
 		exp.spotifyArtwork=localStorage.getItem("artwork")
-		exp.spotifyTemplete=localStorage.getItem("np-temp")
+		var content=localStorage.getItem("np-temp");
+		if(content || content=="" || content=="null"){
+			exp.spotifyTemplete=content;
+		}else{
+			exp.spotifyTemplete=null;
+		}
 		//tags
 		var tagarr = localStorage.getItem("tag");
 		var favtag = JSON.parse(tagarr);
@@ -604,6 +609,7 @@ function importSettings(){
 				if(obj.favoriteTags){
 					localStorage.setItem("tag",JSON.stringify(obj.favoriteTags));
 				}
+				
 				localStorage.setItem("np-temp",obj.spotifyTemplete);
 				for(var i=0;i<obj.columns.length;i++){
 					localStorage.setItem("card_" + i,"true");
diff --git a/app/js/ui/spotify.js b/app/js/ui/spotify.js
index 3a6a2dba..e7460eee 100644
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@@ -42,7 +42,7 @@ function checkSpotify(){
         $("#spotify-disable").addClass("disabled");
     }
     var content=localStorage.getItem("np-temp");
-    if(!content || content==""){
+    if(!content || content=="" || content=="null"){
         var content="#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
     }
     $("#np-temp").val(content);
@@ -80,6 +80,9 @@ function nowplaying(mode){
             console.error(error);
         }).then(function(json) {
             console.log(json);
+            if(json.length<1){
+                return false;
+            }
             var item=json.item;
             var img=item.album.images[0].url;
             var electron = require("electron");
@@ -89,7 +92,7 @@ function nowplaying(mode){
                 ipc.send('bmp-image', [img,0]);
             }
             var content=localStorage.getItem("np-temp");
-            if(!content || content==""){
+            if(!content || content=="" || content=="null"){
                 var content="#NowPlaying {song} / {album} / {artist}\n{url}";
             }
             var regExp = new RegExp("{song}", "g");
@@ -124,7 +127,7 @@ function nowplaying(mode){
 	    ipc.on('itunes-np', function (event, arg) {
             console.log(arg);
             var content=localStorage.getItem("np-temp");
-            if(!content || content==""){
+            if(!content || content=="" || content=="null"){
                 var content="#NowPlaying {song} / {album} / {artist}\n{url}";
             }
             var regExp = new RegExp("{song}", "g");
diff --git a/app/js/ui/tips.js b/app/js/ui/tips.js
index d5e1a8a6..e3c04d80 100644
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -14,7 +14,7 @@ function tips(mode){
 	clearInterval(spotStart);
 	if(mode=="ver"){
 		tipsToggle()
-		$("#tips-text").html('<img src="./img/desk.png" width="20"><span style="font-size:20px">TheDesk</span> '+localStorage.getItem("ver"))
+		$("#tips-text").html('<img src="./img/desk.png" width="20"><span style="font-size:20px">TheDesk</span> '+localStorage.getItem("ver")+'[<i class="material-icons" style="font-size:1.2rem;top: 3px;position: relative;">supervisor_account</i><span id="persons"></span>]')
 		localStorage.setItem("tips","ver")
 	}else if(mode=="clock"){
 		tipsToggle()
@@ -109,6 +109,7 @@ function spotifytips(){
 					artisttxt=item.artists[0].name;
 				}
 			}
+			artisttxt=escapeHTML(artisttxt);
 			sleep(last);
 			var tms=item.duration_ms;
 			var per=ms/item.duration_ms*100;
@@ -124,7 +125,7 @@ function spotifytips(){
 				ts="0"+ts;
 			}
 			var tm=(Math.round(tms)-Math.round(tms)%60)/60;
-			$("#tips-text").html('<div id="spot-box"><i class="material-icons pointer" onclick="spotifytips()" style="font-size:12px">refresh</i><img src="'+img+'" width="20" id="spot-img">'+item.name+'<span class="gray sml" id="spot-art">'+artisttxt+'</span><span id="spot-m">'+m+'</span>:<span id="spot-s">'+s+'</span>/'+tm+":"+ts+'</span></div><div class="progress grey"><div class="determinate spotify-prog grey lighten-2" style="width: '+per+'%" data-s="'+Math.round(ms)+'" data-total="'+item.duration_ms+'"></div></div>');
+			$("#tips-text").html('<div id="spot-box"><i class="material-icons pointer" onclick="spotifytips()" style="font-size:12px">refresh</i><img src="'+img+'" width="20" id="spot-img">'+escapeHTML(item.name)+'<span class="gray sml" id="spot-art">'+artisttxt+'</span><span id="spot-m">'+m+'</span>:<span id="spot-s">'+s+'</span>/'+tm+":"+ts+'</span></div><div class="progress grey"><div class="determinate spotify-prog grey lighten-2" style="width: '+per+'%" data-s="'+Math.round(ms)+'" data-total="'+item.duration_ms+'"></div></div>');
 			spotint=setInterval(spotStart, 1000);
         });
         }else{
diff --git a/app/package.json b/app/package.json
index 9c6d9d13..77354889 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "16.0.10",
+  "version": "16.0.11",
   "description": "TheDesk is a Mastodon client for PC.",
   "main": "main.js",
   "scripts": {