Merge pull request #63 from cutls/WIP-(before-CI)

Wip (before ci)

.travis.yml

@@ -1,31 +1,34 @@
-os: windows
-language: node_js
-node_js:
-- '10.15.2'
+language: objective-c
+cache:
+  directories:
+    - node_modules
+env:
+  - NODE_VERSION="10.15.2"
+before_install:
+  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
+  - source /tmp/.nvm/nvm.sh
+  - nvm install $NODE_VERSION
+  - nvm use --delete-prefix $NODE_VERSION
+  - node --version
 script: node -v
 before_deploy:
-  - cd app
   - npm install electron-builder -g
+  - cd app
   - npm install
-  - electron-builder --win --ia32
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup-ia32.exe
-  - mv ../build/TheDesk*.exe ../TheDesk-ia32.exe
-  - electron-builder --win --x64
-  - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe
-  - mv ../build/TheDesk*.exe ../TheDesk.exe
+  - electron-builder --mac --x64 -p never
+  - mv ../build/TheDesk*.dmg ../TheDesk.dmg
+  - mv ../build/TheDesk*.zip ../TheDesk-darwin-x64.zip
   - cd ../
-  - ls
-after_deploy: ls
 deploy:
-  skip_cleanup: true
   provider: releases
+  # GitHub にリリースするための API KEY を暗号化した値
   api_key:
     secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
-  file: 
-    - TheDesk.exe
-    - TheDesk-setup.exe
-    - TheDesk-ia32.exe
-    - TheDesk-setup-ia32.exe
+  # Releases ページにアップロードするファイル
+  file:
+    - TheDesk.dmg
+    - TheDesk-darwin-x64.zip
+  skip_cleanup: true
   on:
     repo: cutls/TheDesk
 branches:

README.md

@@ -27,6 +27,8 @@ The icon is provided under [Creative Commons BY-NC-SA](https://creativecommons.o
 * [ico](https://dl.thedesk.top/press/TheDesk.ico)
 * [icns](https://dl.thedesk.top/press/TheDesk.icns)
 
+The default sound of notifications is provided [Creative Commons BY](https://creativecommons.org/licenses/by/4.0/)
+
 ## Terms of Use/利用規約
 
 * [利用規約(Terms of Use(ja))](https://thedesk.top/tos.html)
@@ -73,11 +75,38 @@ iTunes NowPlayingにアルバムアートワークを付けてくれた人
 ## Build/ビルド
 
 Misskey(misskey.xyz) application token is not in cutls/TheDesk  
-Misskey(misskey.xyz)のトークンは含まれておりません。  
-`git clone https://github.com/cutls/TheDesk`  
-`npm install electron -g`  
-`cd TheDesk/app`  
-`npm install`  
+Misskey(misskey.xyz)のトークンは含まれておりません。
+
+```sh
+git clone https://github.com/cutls/TheDesk
+cd TheDesk/app
+npm install
+npm install --only=dev
+```
+
+### electron-builder(推奨)
+Use npm scripts.  
+npm scriptsを利用します
+
+```sh
+# Build for current platform
+# 実行している環境向けにビルド
+npm run build
+
+# Select build target
+# ターゲットを指定してビルド
+## Windows
+npm run build:win
+
+## Windows and Linux (The macOS target should run on macOS. So, this option hasn't include the build for macOS)
+## macOS向けのビルドにはmacOSで実行する必要があるためこのコマンドではビルドされません
+npm run build:all
+```
+
+Config is all on package.json  
+ビルド設定はすべてpackage.jsonに記載しています。  
+
+### electron-packager(非推奨)
 `npm install --save-dev electron-rebuild`  
   
 Linux/macOS  
@@ -91,8 +120,6 @@ WindowsでPython 2.xやVisualC++を一発でインストールできるツール
   
 日本語話者向けですが、macOSビルドにはXCodeが要るとの情報があります。([とねぢ](https://minohdon.jp/@toneji)氏談)  
 
-### 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=4.0.5 --icon=.\app\thedesk.ico --overwrite`  
 Linux  
@@ -100,11 +127,6 @@ Linux
 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=4.0.5 --icon=./app/icon.icns --overwrite`  
 
-### electron-builder
-
-Config is all on package.json  
-ビルド設定はすべてpackage.jsonに記載しています。  
-
 ## Pleroma support
 
 Did you find a bug with Pleroma accounts?  

app/about.html

@@ -76,7 +76,7 @@ a,button{
 <img src="./img/desk.png" style="max-width:70%;">
 <h5>TheDesk</h5>
 <div class='container'>
-    <div class='area-name1'>External version</div>
+    <div class='area-name1'>Display version</div>
     <div class='area-data1' id="now"></div>
     <div class='area-name2'>Internal version</div>
     <div class='area-data2' id="ver"></div>
@@ -87,13 +87,17 @@ a,button{
     <div class='area-name5'>Node.js</div>
     <div class='area-data5' id="node"></div>
   </div>
-  <div class="cp">Copyright &copy; TheDesk 2018 All rights reserved.<br><a href="https://thedesk.top" target="_blank">Web site</a></div>
+  <div class="cp">Copyright &copy; <a href="https://kirishima.cloud/@Cutls" target="_blank">Cutls P</a> 2018 All rights reserved.<br>
+    Thanks:<a href="https://minohdon.jp/@toneji" target="_blank">toneji</a>/<a href="https://popon.pptdn.jp/@popn_ja" target="_blank">popn_ja</a>/<a href="https://pawoo.net/@kPherox" target="_blank">kPherox</a> and all users
+    <img draggable="false" style="width:0.8rem;top: 1px;margin-left: 1px;position: relative;" alt="❤️" title=":heart:" src="https://twemoji.maxcdn.com/2/72x72/2764.png">
+<br><a href="https://thedesk.top" target="_blank">Web site</a></div>
 <button onclick="window.close()" class="btn waves-effect indigo" style="width:calc(100% - 10px);"><i class="material-icons left">close</i>Close</button>
 <script type="text/javascript" src="./js/ui/theme.js"></script>
 <script>
     $("#now").text(localStorage.getItem("ver"));
     var electron = require("electron");
     var remote=electron.remote;
+    const shell=electron.shell;
     //JSON.parse(fs.readFileSync(info_path, 'utf8'));
     console.log(process.versions);
     $("#node").text(process.version);
@@ -104,6 +108,9 @@ a,button{
         var ver=m[1];
         $("#ver").text(ver);
     }
-    
-</script>
-<script type="text/javascript" src="./js/platform/end.js"></script>
+$(document).on('click', 'a', e => {
+    var url =  $(e.target).attr('href');
+    shell.openExternal(url);
+    return false;
+});
+</script>

app/css/master.css

@@ -30,6 +30,8 @@ option {
 }
 #mainView {
   padding: 10px;
+  overflow:scroll;
+  height: auto;
 }
 #message {
   display: none;

app/css/tl.css

@@ -249,6 +249,29 @@ grid-area: toot;
   margin:2px;
   grid-area: side;
 }
+
+.quote-renote{
+  display: grid;
+  grid-template-columns: 43px 2fr 1fr;
+  grid-template-areas: 'ricon ruser' 'ricon rtext';
+  border: 1px solid;
+  margin-top: 3px;
+  padding: 1px;
+  border-radius: 3px;
+}
+.renote-icon{
+  grid-area: ricon;
+}
+.renote-icon img{
+  width:43px;
+}
+.renote-user{
+  grid-area: ruser;
+}
+.renote-text{
+  grid-area: rtext;
+}
+
 .btn-flat{
   color:var(--color);
 }

app/js/common/version.js

@@ -190,7 +190,7 @@ function verck(ver) {
 					}
 				}
 				if(show){
-					Materialize.toast(obj.Text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+					Materialize.toast(escapeHTML(obj.Text)+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
 				}
 			}
 			
@@ -211,9 +211,6 @@ function infowebsocket(){
 		console.log(JSON.parse(mess.data));
 		var obj=JSON.parse(mess.data);
 		if(obj.type!="counter"){
-		if(obj.id*1<=localStorage.getItem("last-notice-id")){
-			
-		}else{
 			localStorage.setItem("last-notice-id",obj.id)
 			var show=true;
 			if(obj.toot!=""){
@@ -242,9 +239,8 @@ function infowebsocket(){
 				}
 			}
 			if(show){
-				Materialize.toast(obj.text+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
+				Materialize.toast(escapeHTML(obj.Text)+toot+'<span class="sml grey-text">(スライドして消去)</span>', 86400);
 			}
-		}
 	}else{
 		$("#persons").text(obj.text);
 	}

app/js/lang/lang.en.js

@@ -141,6 +141,7 @@ var lang={
     "lang_hisdata_frcwarn":"Unfollow accounts will be shown.",
     "lang_hisdata_taketime":"It will take 30s ~ several minutes",
     "lang_hisdata_notonmisskey":"Misskey is unable to request.",
+    "lang_hisdata_key":"This user is proofed by {{set}}",
     //userdata/showOnTL.js
     "lang_showontl_movetxt":"This account was moved",
     "lang_showontl_movebtn":"Continue on the new account",
@@ -188,7 +189,7 @@ var lang={
     "lang_parse_clientmute":"muted",
     "lang_parse_mute":" will be muted. You can remove on preferences.",
     "lang_parse_voted":"Voted",
-    "lang_parse_vote":"Voted",
+    "lang_parse_vote":"Vote",
     "lang_parse_unvoted":"Show the result without voting",
     "lang_parse_endedvote":"Expired",
     "lang_parse_thread":"Show thread",

app/js/lang/lang.ja.js

@@ -143,6 +143,7 @@ var lang={
     "lang_hisdata_frcwarn":"非フォローだけど絡みがある時に表示されます。",
     "lang_hisdata_taketime":"30秒から数分かかります",
     "lang_hisdata_notonmisskey":"このシステムはMisskeyにはありません。",
+    "lang_hisdata_key":"このユーザーの信頼性は{{set}}によって示されています",
 //userdata/showOnTL.js
     "lang_showontl_movetxt":"このアカウントは移行しています",
     "lang_showontl_movebtn":"移行先を見る",

app/js/login/manager.js

@@ -364,6 +364,28 @@ function misskeyLogin(url) {
 				"reaction-write",
 				"vote-read",
 				"vote-write"
+				/*
+				"read:account",
+				"write:account",
+				"read:drive",
+				"write:drive",
+				"read:blocks",
+				"write:blocks",
+				"read:favorites",
+				"write:favorites",
+				"read:following",
+				"write:following",
+				"read:messaging",
+				"write:messaging",
+				"read:mutes",
+				"write:mutes",
+				"write:notes",
+				"read:notifications",
+				"write:notifications",
+				"read:reactions",
+				"write:reactions",
+				"write:votes"
+				*/
 			]
 	}));
     httpreq.onreadystatechange = function() {
@@ -520,7 +542,7 @@ function getdata(domain, at) {
 		console.log(json);
 		if (json.error) {
 			console.error("Error:" + json.error);
-			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + json.error,
+			Materialize.toast(lang.lang_fatalerroroccured+"Error:" + escapeHTML(json.error),
 				5000);
 			return;
 		}
@@ -795,7 +817,7 @@ input.addEventListener("focus", function() {
 						Object.keys(json.instances).forEach(function(key) {
 							var url = json.instances[key];
 							urls = urls + '　<a onclick="login(\'' + url.name +
-								'\')" class="pointer">' + url.name + '</a>  ';
+								'\')" class="pointer">' +escapeHTML(url.name)  + '</a>  ';
 						});
 						$("#ins-suggest").html(urls);
 					}

app/js/platform/end.js

@@ -35,8 +35,11 @@
 			
 		}else if(tags){
 			if(tags[2]){
-				tagShow(tags[2]);
-				Materialize.toast('<a class="btn-flat toast-action" href="detEx(\''+url+'\')">Open in browser</a>', 86400);
+				var acct_id=$a.parent().attr("data-acct");
+				if(!acct_id){
+					acct_id=0;
+				}
+				tl('tag',decodeURI(tags[2]),acct_id,'add')
 			}
 		}else if(ats){
 			console.log(ats);
@@ -178,4 +181,21 @@ const {
 } = require('electron');
 webviewDom.addEventListener('new-window', function(e) {
     shell.openExternal(e.url);
-});
+});
+function playSound() {
+	window.AudioContext = window.AudioContext || window.webkitAudioContext;
+	context = new AudioContext();
+	context.createBufferSource().start(0);
+	context.decodeAudioData(request.response, function (buf) {
+		console.log(source)
+		source.buffer = buf;
+		source.loop = false;
+	});
+	source = context.createBufferSource();
+	volumeControl = context.createGain();
+	source.connect(volumeControl);
+	volumeControl.connect(context.destination);
+	volumeControl.gain.value=0.8
+	console.log(volumeControl)
+	source.start(0);
+}

app/js/platform/first.js

@@ -32,6 +32,13 @@ function nl2br(str) {
 	str = str.replace(/(\n|\r)/g, "<br />");
     return str;
 }
+function br2nl(str) {
+	if(!str){
+		return "";
+	}
+    str = str.replace(/<br \/>/g, "\r\n");
+    return str;
+}
 function formattime(date){
 	var str=date.getFullYear()+"-";
 	if(date.getMonth()+1<10){
@@ -55,7 +62,7 @@ function formattime(date){
 	}else{
 		str=str+date.getMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
 function formattimeutc(date){
 	var str=date.getUTCFullYear()+"-";
@@ -80,7 +87,7 @@ function formattimeutc(date){
 	}else{
 		str=str+date.getUTCMinutes()
 	}
-	return str;
+	return escapeHTML(str);
 }
 var electron = require("electron");
 var ipc = electron.ipcRenderer;

app/js/post/emoji.js

@@ -35,7 +35,7 @@ function emojiToggle(reaction) {
 
 //絵文字リスト挿入
 function emojiGet(parse, started) {
-	$('#emoji-list').html('Loading...');
+	$('#emoji-list').text('Loading...');
 	var acct_id = $("#post-acct-sel").val();
 	var domain = localStorage.getItem("domain_" + acct_id);
 	if (localStorage.getItem("mode_" + domain) != "misskey") {
@@ -52,7 +52,7 @@ function emojiGet(parse, started) {
 			console.error(error);
 		}).then(function (json) {
 			if (parse == "true") {
-				$('#emoji-list').html('Parsing...');
+				$('#emoji-list').text('Parsing...');
 				//絵文字をマストドン公式と同順にソート
 				json.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;
@@ -96,7 +96,7 @@ function emojiGet(parse, started) {
 				})
 			});
 			if (parse == "true") {
-				$('#emoji-list').html('Parsing...');
+				$('#emoji-list').text('Parsing...');
 				//絵文字をマストドン公式と同順にソート
 				md.sort(function (a, b) {
 					if (a.shortcode < b.shortcode) return -1;

app/js/post/misskeystatus.js

@@ -234,7 +234,7 @@ function voterefresh(acct_id,id){
                     }else{
                            var myvote="";
                     }
-                    poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
+                    poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+json.id+'\','+choice.id+')">'+escapeHTML(choice.text)+'('+choice.votes+''+myvote+')</div>';
                 });
                 $(".vote_"+json.id).html(poll)
 		    }

app/js/post/post.js

@@ -298,7 +298,7 @@ function clear() {
 	$("#post-acct-sel").prop("disabled", false);
 	$("#days_poll").val(0);
   $("#hours_poll").val(0);
-	$("#mins_poll").val(0);
+	$("#mins_poll").val(6);
 	$(".mastodon-choice").map(function() {
 		$(this).val("");
 	});

app/js/post/suggest.js

@@ -169,7 +169,7 @@ function cgNPs(q){
 						var tags = "";
 						Object.keys(json).forEach(function(key4) {
 							var tag = json[key4];
-							tags = tags + '<a onclick="cgNP(\''+json[key4]+'\')" class="pointer">' + json[key4] + '</a>  ';
+							tags = tags + '<a onclick="cgNP(\''+json[key4]+'\')" class="pointer">' + escapeHTML(json[key4]) + '</a>  ';
 						});
 						$("#suggest").html("Cinderella NowPlaying:" + tags);
 					}else{

app/js/tl/card.js

@@ -4,9 +4,9 @@ function additional(acct_id, tlid) {
 	//メンション系
 	//$(".mention").attr("href", "");
 	
-	$(".mention").addClass("parsed");
+	$("#timeline-container .mention").addClass("parsed");
 
-	$(".hashtag").each(function(i, elem) {
+	$("#timeline-container .hashtag").each(function(i, elem) {
 		var tags = $(this).attr("href").match(
 			/https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
 		);
@@ -17,8 +17,6 @@ function additional(acct_id, tlid) {
 			}
 			
 		}
-		
-		
 	});
 	
 	//トゥートサムネ
@@ -34,6 +32,7 @@ function additional(acct_id, tlid) {
 				);
 			}
 		}else{
+			text=""
 			var urls =[]
 		}
 		
@@ -64,8 +63,8 @@ function additional(acct_id, tlid) {
 				}).then(function(json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
-							json.description + "</span>");
+							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(json.title) + "<br>" +
+							escapeHTML(json.description) + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
 					}
@@ -149,8 +148,8 @@ function additionalIndv(tlid, acct_id, id) {
 				}).then(function(json) {
 					if (json.title) {
 						$("[toot-id=" + id + "] .additional").html(
-							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + json.title + "<br>" +
-							json.description + "</span>");
+							"<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(json.title) + "<br>" +
+							escapeHTML(json.description) + "</span>");
 						$("[toot-id=" + id + "] a:not(.parsed)").addClass("parsed");
 						$("[toot-id=" + id + "]").addClass("parsed");
 					}

app/js/tl/dm.js

@@ -243,7 +243,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         var id = toot.id;
         var home = "";
 		if (toot.account.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
@@ -251,7 +251,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			var via = '';
 			viashow="hide";
 		} else {
-			var via = toot.application.name;
+			var via = escapeHTML(toot.application.name);
 			//強調チェック
 			Object.keys(emp).forEach(function(key6) {
 				var cli = emp[key6];
@@ -432,7 +432,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				if(word){
 					var word=word.tag;
 					var regExp = new RegExp( word, "g" ) ;
-					content=content.replace(regExp,'<span class="emp">'+word+"</span>");
+					content=content.replace(regExp,'<span class="emp">'+escapeHTML(word)+"</span>");
 				}
 			});
 		}
@@ -483,7 +483,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+escapeHTML(value.name)+'</span></div>';
 					break;
 				}
 		   }
@@ -506,7 +506,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.account.acct + locked + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
 			toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock-o"></i>' +
 			date(toot.created_at, datetype) + '</span>' +
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="' +

app/js/tl/list.js

@@ -30,7 +30,7 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+					lists = lists + escapeHTML(list.title)+':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_show+'</a><br>';
 				});
 				$("#lists").html(lists);
@@ -57,7 +57,7 @@ function list(){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+					lists = lists + escapeHTML(list.title)+':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_show+'</a>/<a onclick="listUser(\'' + list.id + '\',' + acct_id +
 						')" class="pointer">'+lang.lang_list_users+'</a><br>';
 				});
@@ -193,7 +193,7 @@ function hisList(user,acct_id){
 			Object.keys(json).forEach(function(key) {
                 var list = json[key];
 				lists = lists + '<a onclick="listRemove(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
-					'\')" class="pointer">'+list.title+'</a><br> ';
+					'\')" class="pointer">'+escapeHTML(list.title)+'</a><br> ';
 			});
 			$("#his-lists-b").html(lists);
 		}else{
@@ -217,7 +217,7 @@ function hisList(user,acct_id){
 				var lists = "";
 				Object.keys(json).forEach(function(key) {
 					var list = json[key];
-					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + list.title + '\',\'' + acct_id +
+					lists = lists + list.title+':<a onclick="listShow(\'' + list.id + '\',\'' + escapeHTML(list.title) + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_show+'</a>/<a onclick="listAdd(\'' + list.id + '\',\'' + user + '\',\'' + acct_id +
 						'\')" class="pointer">'+lang.lang_list_add+lang.lang_list_add_misskey+'</a><br>';
 				});

app/js/tl/misskeyparse.js

@@ -161,14 +161,16 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			disname="";
 		}
 		//絵文字があれば
-		Object.keys(toot.user.emojis).forEach(function(key5) {
-			var emoji = toot.user.emojis[key5];
-			var shortcode = emoji.name;
-			var emoji_url = '<img draggable="false" src="' + emoji.url +
-				'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
-			var regExp = new RegExp(":" + shortcode + ":", "g");
-			dis_name = dis_name.replace(regExp, emoji_url);
-		});
+		if(toot.user.emojis){
+			Object.keys(toot.user.emojis).forEach(function(key5) {
+				var emoji = toot.user.emojis[key5];
+				var shortcode = emoji.name;
+				var emoji_url = '<img draggable="false" src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				dis_name = dis_name.replace(regExp, emoji_url);
+			});
+		}
 		if (mix == "notf") {
 			if (gif == "yes") {
 				noticeavatar = toot.user.avatarUrl;
@@ -182,14 +184,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'"></a>';
 			if (toot.type == "reply") {
 				var what = lang.lang_parse_mentioned;
-				var icon = '<i class="big-text fa fa-share teal-text"></i>';
+				var icon = '<i class="big-text fas fa-share teal-text"></i>';
 				noticeavatar="";
 			} else if (toot.type == "renote") {
 				var what = lang.lang_misskeyparse_renoted;
-				var icon = '<i class="big-text fa fa-retweet light-blue-text"></i>';
+				var icon = '<i class="big-text fas fa-retweet light-blue-text"></i>';
 			}  else if (toot.type == "quote") {
 				var what = lang.lang_misskeyparse_quoted;
-				var icon = '<i class="big-text fa fa-quote-right orange-text"></i>';
+				var icon = '<i class="big-text fas fa-quote-right orange-text"></i>';
 			} else if (toot.type == "reaction") {
 				var what = lang.lang_misskeyparse_reacted;
 				var reactions={
@@ -224,7 +226,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				var icon = '<i class="big-text material-icons indigo-text" style="font-size:17px">info</i>';
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.createdAt,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 				datetype) +
 			'</span>'+icon+'<a onclick="udg(\'' + toot.user.username +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
@@ -284,18 +286,20 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			}
 			var if_notf='data-notfIndv="'+acct_id+"_"+toot.id+'"';
 			var toot = toot.note;
-			var dis_name=escapeHTMLtemp(toot.user.name);
+			var dis_name=escapeHTML(toot.user.name);
 		}else{
 			var if_notf="";
 			if (toot.renote) {
 				var rebtxt = lang.lang_parse_btedsimple;
 				var rticon = "fa-retweet light-blue-text";
-				var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username +
+				var notice = '<i class="big-text fas '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username +
 					")<br>";
 					var boostback = "shared";
 				var uniqueid=toot.id;
-				var toot = toot.renote;
-				var dis_name=escapeHTMLtemp(toot.user.name);
+				if(!toot.text){
+					var toot = toot.renote;
+				}
+				var dis_name=escapeHTML(toot.user.name);
 			    var uniqueid=toot.id;
 				var actemojick=false
 			} else {
@@ -338,7 +342,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
             if(toot.viaMobile){
                 var via = '<span style="font-style: italic;">Mobile</span>';
             }else{
-                var via = '<span style="font-style: italic;">Unknown</span>';
+                var via = '';
             }
 		} else {
 			var via = toot.app.name;
@@ -358,7 +362,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			});
 		}
 		if ((toot.cw || toot.cw=="") && cw) {
-			var content = toot.text;
+			var content = escapeHTML(toot.text);
 			var spoil = escapeHTMLtemp(toot.cw);
 			var spoiler = "cw cw_hide_" + toot.id;
 			var api_spoil = "gray";
@@ -614,7 +618,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+escapeHTML(value.name)+'</span></div>';
 					break;
 				}
 		   }
@@ -630,13 +634,15 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}else{
 					var myvote="";
 				}
-				poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+toot.id+'\','+choice.id+')">'+choice.text+'('+choice.votes+''+myvote+')</div>';
+				poll=poll+'<div class="pointer vote" onclick="vote(\''+acct_id+'\',\''+toot.id+'\','+choice.id+')">'+escapeHTML(choice.text)+'('+choice.votes+''+myvote+')</div>';
 			});
 			poll='<div class="vote_'+toot.id+'">'+poll+'</div>';
 		}
-		/*
-		
-			*/
+		//引用Renote
+		if(toot.renote){
+			poll=poll+'<div class="quote-renote"><div class="renote-icon"><a onclick="udg(\'' + toot.renote.user.id +
+			'\',' + acct_id + ');" user="' + toot.renote.user.username + '" class="udg"><img src="'+toot.renote.user.avatarUrl+'"></a></div><div class="renote-user">'+escapeHTML(toot.renote.user.name)+'</div><div class="renote-text">'+escapeHTML(toot.renote.text)+'</div></div>'
+		}
 			if(localStorage.getItem("emojiReaction_" + acct_id)=="disabled"){
 				var freeReact="hide";
 			}else{
@@ -665,7 +671,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 						var emoji = obj[i];
 						if (":"+emoji.shortcode+":"==keye) {
 							if (emoji) {
-								addReact=addReact+	'<span class="reaction "><a onclick="reaction(\''+keye+'\',\'' + toot.id + '\',' + acct_id +
+								addReact=addReact+	'<span class="reaction"><a onclick="reaction(\''+keye+'\',\'' + toot.id + '\',' + acct_id +
 								',\'' + tlid +'\')" class="waves-effect waves-dark btn-flat pointer" style="padding:0;margin-left:3px;"><img src="'+emoji.url+'" style="width:13px;"></a><span class="re-'+emoji.shortcode+'ct">'+thisReact+
 								'</span></span>';
 							}
@@ -777,7 +783,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.user.username + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'https://' +domain+"/notes/"+
 			toot.id + '\');" title="' + date(toot.createdAt, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock"></i>' +
 			date(toot.createdAt, datetype) + '</span>' +
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="toot ' + spoiler + '">' + content +
@@ -814,28 +820,28 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="misskeyreply(\'' + toot.id +
 			'\',\'' + acct_id + '\',' +
 			acct_id + ',\''+visen+
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fas fa-share"></i></a></div>' +
 			'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="renote(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id +
-			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
 			'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="reactiontoggle(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fa text-darken-3 fa-plus' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fas text-darken-3 fa-plus' +
 			if_fav + ' fav_' + toot.id + '"></i></div>' +
 			'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fas fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + '"></i></a></div>' 
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fas fa-map-pin pin_' + toot.id + '"></i></a></div>' 
 			+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
 			'<span class="cbadge viabadge waves-effect '+viashow+' '+mine_via+'" onclick="client(\''+$.strip_tagstemp(via)+'\')" title="via ' + $.strip_tagstemp(via) + '">via ' +
-			via +
+			escapeHTML(via) +
 			'</span>'+
 			'</div><div class="area-side '+mouseover+'"><div class="action ' + if_mine + ' '+noauth+'"><a onclick="toggleAction(\'' + toot.id + '\',\''+tlid+'\',\''+acct_id+'\')" class="waves-effect waves-dark btn-flat" style="padding:0"><i class="text-darken-3 material-icons act-icon">expand_more</i></a></div>' +
 			'<div class="action '+noauth+'"><a onclick="details(\'' + toot.id + '\',' + acct_id +
@@ -867,7 +873,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		var ftxt=lang.lang_parse_followed;
 		if(popup > 0 || popup==-1){
 			var notftext='<span class="cbadge"title="' + date(toot.createdAt,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 				datetype) +
 			'</span>'+ftxt+'<br>';
 			var toot = toot.user;
@@ -911,7 +917,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 				var dis_name=escapeHTMLtemp(toot.name);
 				dis_name=twemoji.parse(dis_name);
 			}else{
-				var dis_name=toot.name;
+				var dis_name=toot.username;
 			}
 		templete = templete +
 			'<div class="cvo" style="padding-top:5px;" user-id="' + toot.id + '"><div class="area-notice">' +

app/js/tl/mix.js

@@ -94,12 +94,14 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 	websocketLocal[wslid] = new WebSocket(startLocal);
 	websocketHome[wshid].onopen = function(mess) {
 		localStorage.setItem("wssH_" + tlid, wshid);
-		console.log("Connect Streaming API(Integrated:Home)");
+		console.log(tlid + ":Connect Streaming API(Integrated:Home)");
+		console.log(mess);
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onopen = function(mess) {
 		localStorage.setItem("wssL_" + tlid, wslid);
-		console.log("Connect Streaming API(Integrated:Local)");
+		console.log(tlid + ":Connect Streaming API(Integrated:Local)");
+		console.log(mess);
 		$("#notice_icon_" + tlid).removeClass("red-text");
 	}
 	websocketLocal[wslid].onmessage = function(mess) {
@@ -195,39 +197,57 @@ function mixre(acct_id, tlid, TLtype, mute,delc,voice,mode) {
 		}
 	}
 	websocketLocal[wslid].onerror = function(error) {
-		console.error('WebSocket Error ' + error);
+		console.error('WebSocketLocal Error')
+		console.error(error);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Error ' + error);
 		}else{
-			reconnector(tlid,TLtype,acct_id,"","error");
+			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
+			localStorage.setItem("wserror_" + tlid,errorct);
+			if(errorct<3){
+				reconnector(tlid,TLtype,acct_id,"","error");
+			}
 		}
 	};
 	websocketLocal[wslid].onclose = function() {
-		console.error('WebSocketLocal Closing by error:' + tlid);
+		console.log('WebSocketLocal Closing:' + tlid);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
 		}else{
-			reconnector(tlid,TLtype,acct_id,"","error");
+			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
+			localStorage.setItem("wserror_" + tlid,errorct);
+			if(errorct<3){
+				reconnector(tlid,TLtype,acct_id,"","error");
+			}
 		}
 	};
 	websocketHome[wshid].onerror = function(error) {
-		console.error('WebSocket Error ' + error);
+		console.error('WebSocketHome Error')
+		console.error(error);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Error ' + error);
 		}else{
-			reconnector(tlid,TLtype,acct_id,"","error");
+			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
+			localStorage.setItem("wserror_" + tlid,errorct);
+			if(errorct<3){
+				reconnector(tlid,TLtype,acct_id,"","error");
+			}
 		}
 	};
 	websocketHome[wshid].onclose = function() {
-		console.error('WebSocketHome Closing by error:' + tlid);
+		console.log('WebSocketHome Closing:' + tlid);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
 		}else{
-			reconnector(tlid,TLtype,acct_id,"","error");
+			var errorct=localStorage.getItem("wserror_" + tlid)*1+1;
+			localStorage.setItem("wserror_" + tlid,errorct);
+			if(errorct<3){
+				reconnector(tlid,TLtype,acct_id,"","error");
+			}
 		}
 		
 	};

app/js/tl/notification.js

@@ -112,73 +112,6 @@ function notfColumn(acct_id, tlid, sys){
 		at;
 	}
 
-	console.log(start);
-	var wsid = websocketNotf.length;
-	websocketNotf[acct_id] = new WebSocket(start);
-	console.log(websocketNotf);
-	websocketNotf[acct_id].onopen = function(mess) {
-		console.log("Connect Streaming API(Notf):");
-		console.log(mess);
-		$("i[data-notf=" + acct_id +"]").removeClass("red-text");
-
-	}
-	websocketNotf[acct_id].onmessage = function(mess) {
-		console.log("Receive Streaming API(Notf):"+acct_id);
-		var popup = localStorage.getItem("popup");
-			if (!popup) {
-				popup = 0;
-			}
-			console.log(domain)
-		if(misskey){
-			console.log("misskey")
-			console.log(JSON.parse(mess.data));
-			if (JSON.parse(mess.data).type == "notification") {
-				var obj = JSON.parse(mess.data).body;
-				console.log(obj);
-				if(obj.type!="follow"){
-					
-					templete = misskeyParse([obj], 'notf', acct_id, 'notf', popup);
-				}else{
-					templete = misskeyUserparse([obj], 'notf', acct_id, 'notf', popup);
-				}
-				if(obj.type=="reaction"){
-					console.log("refresh")
-					reactRefresh(acct_id,obj.note.id)
-				}
-				if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-					$("div[data-notf=" + acct_id +"]").prepend(templete);
-				}
-				jQuery("time.timeago").timeago();
-			}else if(JSON.parse(mess.data).type == "note-updated"){
-				var obj = JSON.parse(mess.data).body.note;
-				reactRefreshCore(obj)
-			}
-		}else{
-		var obj = JSON.parse(JSON.parse(mess.data).payload);
-		console.log(obj);
-		var type = JSON.parse(mess.data).event;
-		if (type == "notification") {
-			var templete="";
-			localStorage.setItem("lastnotf_" + acct_id,obj.id);
-			if(obj.type!="follow"){
-				templete = parse([obj], 'notf', acct_id, 'notf', popup);
-			}else{
-				templete = userparse([obj], 'notf', acct_id, 'notf', popup);
-			}
-			if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
-				$(".tl[data-notf=" + acct_id +"]").prepend(templete);
-			}
-			$(".notf-timeline[data-acct=" + acct_id +"]").prepend(templete);
-			jQuery("time.timeago").timeago();
-		} else if (type == "delete") {
-			$("[toot-id=" + obj + "]").hide();
-			$("[toot-id=" + obj + "]").remove();
-		}
-		}
-	}
-	websocketNotf[acct_id].onerror = function(error) {
-		console.error('WebSocket Error ' + error);
-	};
 }
 function notfCommon(acct_id, tlid, sys) {
 	todo("Notifications Loading...");
@@ -233,13 +166,13 @@ function notfCommon(acct_id, tlid, sys) {
 				var ipc = electron.ipcRenderer;
 				var os = electron.remote.process.platform;
 					var options = {
-						body: ct+lang.lang_notf_new[lang],
+						body: ct+lang.lang_notf_new,
 						icon: localStorage.getItem("prof_"+acct_id)
 					  };
 					if(os=="darwin"){
 						var n = new Notification('TheDesk:'+domain, options);
 					}else{
-						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new[lang],localStorage.getItem("prof_"+acct_id)]);
+						ipc.send('native-notf', ['TheDesk:'+domain,ct+lang.lang_notf_new,localStorage.getItem("prof_"+acct_id)]);
 					}
 				
 			}
@@ -318,6 +251,7 @@ function notfCommon(acct_id, tlid, sys) {
 				}
 				if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
 					$("div[data-notf=" + acct_id +"]").prepend(templete);
+					$("div[data-const=notf_"+acct_id+"]").prepend(templete);
 				}
 				jQuery("time.timeago").timeago();
 			}else if(JSON.parse(mess.data).type == "note-updated"){
@@ -338,6 +272,7 @@ function notfCommon(acct_id, tlid, sys) {
 			}
 			if(!$("div[data-notfIndv=" + acct_id +"_"+obj.id+"]").length){
 				$("div[data-notf=" + acct_id +"]").prepend(templete);
+				$("div[data-const=notf_"+acct_id+"]").prepend(templete);
 			}
 			jQuery("time.timeago").timeago();
 		} else if (type == "delete") {

app/js/tl/parse.js

@@ -236,9 +236,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var icon = "fa-tasks  purple-text";
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.created_at,
 				datetype) +
-			'</span><i class="big-text fa '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
+			'</span><i class="big-text fas '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
 				"(@" + toot.account.acct +
 				")</a>";
@@ -251,16 +251,28 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						$(".notf-reply_" + acct_id).text(replyct*1-(-1));
 						localStorage.setItem("notf-reply_" + acct_id,replyct*1-(-1))
 						$(".notf-reply_" + acct_id).removeClass("hide")
+						var sound=localStorage.getItem("replySound");
+						if(sound=="default"){
+							var file="../../source/notif3.wav"
+						}
 					}else if (toot.type == "reblog") {
 						var btct=localStorage.getItem("notf-bt_" + acct_id)
 						$(".notf-bt_" + acct_id).text(btct*1-(-1));
 						localStorage.setItem("notf-bt_" + acct_id,btct*1-(-1))
 						$(".notf-bt_" + acct_id).removeClass("hide")
+						var sound=localStorage.getItem("btSound");
+						if(sound=="default"){
+							var file="../../source/notif2.wav"
+						}
 					}else if (toot.type == "favourite") {
 						var favct=localStorage.getItem("notf-fav_" + acct_id)
 						$(".notf-fav_" + acct_id).text(favct*1-(-1));
 						localStorage.setItem("notf-fav_" + acct_id,favct*1-(-1))
 						$(".notf-fav_" + acct_id).removeClass("hide")
+						var sound=localStorage.getItem("favSound");
+						if(sound=="default"){
+							var file="../../source/notif.wav"
+						}
 					}
 				}
 				
@@ -268,6 +280,23 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				if(popup>0){
 					Materialize.toast("["+domain+"]"+escapeHTML(toot.account.display_name)+what, popup * 1000);
 				}
+				//通知音
+				if(sound=="c1"){
+					var file=localStorage.getItem("custom1");
+				}else if(sound=="c2"){
+					var file=localStorage.getItem("custom2");
+				}else if(sound=="c3"){
+					var file=localStorage.getItem("custom3");
+				}else if(sound=="c4"){
+					var file=localStorage.getItem("custom4");
+				}
+				if(file){
+					request = new XMLHttpRequest();
+      				request.open("GET", file, true);
+      				request.responseType = "arraybuffer";
+      				request.onload = playSound;
+      				request.send();
+				}
 				if(native=="yes"){
 					var electron = require("electron");
 					var ipc = electron.ipcRenderer;
@@ -334,7 +363,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}else if(localStorage.getItem("domain_" + acct_id)=="mstdn.osaka" && !locale){
 					rebtxt = "がしばいた";
 				}
-				var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
+				var notice = '<i class="big-text fas '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
 					")<br>";
 					var boostback = "shared";
 				var uniqueid=toot.id;
@@ -387,7 +416,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var divider = '<div class="divider"></div>';
 		}
 		if (toot.account.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
@@ -395,7 +424,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var via = '';
 			viashow="hide";
 		} else {
-			var via = toot.application.name;
+			var via = escapeHTML(toot.application.name);
 			//強調チェック
 			Object.keys(emp).forEach(function(key6) {
 				var cli = emp[key6];
@@ -452,6 +481,40 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		var viewer = "";
 		var hasmedia = "";
 		var youtube = "";
+		//Poll
+		var poll="";
+		if(toot.poll){
+			var choices=toot.poll.options;
+			if(toot.poll.voted){
+				var myvote=lang.lang_parse_voted;
+				var result_hide="";
+			}else{
+				var myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
+				if(choices[0].votes_count===0 || choices[0].votes_count>0){
+					myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>";
+				}
+				var result_hide="hide";
+			}
+			if(toot.poll.expired){
+				var ended=lang.lang_parse_endedvote;
+			}else{
+				var ended=date(toot.poll.expires_at, datetype);
+			}
+			Object.keys(choices).forEach(function(keyc) {
+				var choice = choices[keyc];
+				if(!toot.poll.voted && !toot.poll.expired){
+					var votesel='voteSelMastodon(\''+acct_id+'\',\''+toot.poll.id+'\','+keyc+','+toot.poll.multiple+')';
+					var voteclass="pointer waves-effect waves-light";
+				}else{
+					var votesel="";
+					var voteclass="";
+				}
+				poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+escapeHTML(choice.title)+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
+			});
+			poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
+			'"><i class="far fa-calendar-times"></i>' +
+			 ended+ '</span></div>';
+		}
 		if(toot.emojis){
 			var emojick = toot.emojis[0];
 		}else{
@@ -467,6 +530,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
+				poll = poll.replace(regExp, emoji_url);
 			});
 		}
 		//ニコフレ絵文字
@@ -475,7 +539,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}else{
 			var nicoemojick=false;
 		}
-		//絵文字があれば
+		//絵文字があれば(nico)
 		if (nicoemojick) {
 			Object.keys(toot.profile_emojis).forEach(function(keynico) {
 				var emoji = toot.profile_emojis[keynico];
@@ -485,6 +549,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var regExp = new RegExp(":" + shortcode + ":", "g");
 				content = content.replace(regExp, emoji_url);
 				spoil = spoil.replace(regExp, emoji_url);
+				poll = poll.replace(regExp, emoji_url);
 			});
 		}
 		//デフォ絵文字
@@ -501,6 +566,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		if(notice){
 			notice=twemoji.parse(notice);
 		}
+		if(poll){
+			poll=twemoji.parse(poll);
+		}
 		var mediack = toot.media_attachments[0];
 		//メディアがあれば
 		var media_ids="";
@@ -698,45 +766,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			for( var i=0; i<tickerdata.length; i++) {
 				var value=tickerdata[i];
 				if(value.domain==thisdomain){
-					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img draggable="false" src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+escapeHTML(value.name)+'</span></div>';
 					break;
 				}
 		   }
 		}
 		}
-		//Poll
-		var poll="";
-		if(toot.poll){
-			var choices=toot.poll.options;
-			if(toot.poll.voted){
-				var myvote=lang.lang_parse_voted;
-				var result_hide="";
-			}else{
-				myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
-				if(choices[0].votes_count===0 || choices[0].votes_count>0){
-					myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>";
-				}
-				var result_hide="hide";
-			}
-			if(toot.poll.expired){
-				var ended=lang.lang_parse_endedvote;
-			}else{
-				var ended=date(toot.poll.expires_at, datetype);
-			}
-			Object.keys(choices).forEach(function(keyc) {
-				var choice = choices[keyc];
-				if(!toot.poll.voted && !toot.poll.expired){
-					var votesel='voteSelMastodon(\''+acct_id+'\',\''+toot.poll.id+'\','+keyc+','+toot.poll.multiple+')';
-					var voteclass="pointer waves-effect waves-light";
-				}else{
-					var votesel="";
-					var voteclass="";
-				}
-				poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
-			});
-			poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
-			'"><i class="fa fa-calendar-times-o"></i>' +
-			 ended+ '</span></div>';
+		//Quote
+		if(toot.quote){
+			poll=poll+'<div class="quote-renote"><div class="renote-icon"><img src="'+toot.quote.account.avatar+'"></div><div class="renote-user">'+escapeHTML(toot.quote.account.display_name)+'</div><div class="renote-text">'+toot.quote.content+'</div></div>'
 		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
@@ -755,13 +793,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			toot.account.acct + locked + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
 			toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock"></i>' +
 			date(toot.created_at, datetype) + '</span>' +
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="' +
 			api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
-			'</span><span class="toot ' + spoiler + '">' + content +poll+
-			'</span>' +
+			'</span><span class="toot ' + spoiler + '">' + content +
+			'</span>' + poll +
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
 			'</span>' +
@@ -774,27 +812,27 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="re(\'' + toot.id +
 			'\',\'' + to_mention + '\',' +
 			acct_id + ',\''+visen+
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i><span class="rep_ct">' + replyct +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fas fa-share"></i><span class="rep_ct">' + replyct +
 			'</a></span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="rt(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count +
 			'</span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+' '+qtClass+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
 			',\'' + toot.account.acct +'\',\''+toot.url+
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
 			'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="fav(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fa text-darken-3 fa-star' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fas text-darken-3 fa-star' +
 			if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count +
 			'</a></span></div>' +
 			'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fas fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fas fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
 			+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
@@ -833,7 +871,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			var notf=false;
 		}
 		if (toot.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
@@ -962,7 +1000,7 @@ function client(name) {
 			if(!obj){
 				var obj=[];
 				obj.push(name);
-				Materialize.toast(name+lang.lang_status_emphas, 2000);
+				Materialize.toast(escapeHTML(name)+lang.lang_status_emphas, 2000);
 			}else{
 			var can;
 			Object.keys(obj).forEach(function(key) {
@@ -972,12 +1010,12 @@ function client(name) {
 				}else{
 					can=true;
 					obj.splice(key, 1);
-					Materialize.toast(name+lang.lang_status_unemphas, 2000);
+					Materialize.toast(escapeHTML(name)+lang.lang_status_unemphas, 2000);
 				}
 			});
 			if(!can){
 				obj.push(name);
-				Materialize.toast(name+lang.lang_status_emphas, 2000);
+				Materialize.toast(escapeHTML(name)+lang.lang_status_emphas, 2000);
 			}else{
 				
 			}
@@ -993,7 +1031,7 @@ function client(name) {
 			obj.push(name);
 			var json = JSON.stringify(obj);
 			localStorage.setItem("client_mute", json);
-			Materialize.toast(name+lang.lang_parse_mute, 2000);
+			Materialize.toast(escapeHTML(name)+lang.lang_parse_mute, 2000);
 		}else{
 			return;
 		}

app/js/tl/poll.js

@@ -108,10 +108,10 @@ function voteMastodonrefresh(acct_id,id){
 				if(!json.voted){
 					votesel='voteSelMastodon(\''+acct_id+'\',\''+json.id+'\','+keyc+','+json.multiple+')';
 				}
-				poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+json.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
+				poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+escapeHTML(choice.title)+'<span class="vote_'+acct_id+'_'+json.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
 			});
 			poll=poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
-			'"><i class="fa fa-calendar-times-o"></i>' +
+			'"><i class="far fa-calendar-times"></i>' +
             date(json.expires_at, datetype) + '</span>';
             $('.vote_'+acct_id+'_'+json.id).html(poll)
 		}

app/js/tl/src.js

@@ -52,7 +52,7 @@ function src(mode) {
 				var tag = json.hashtags[key4];
 				if(mode){
 					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
-					'\',\'add\')" class="pointer">#' + tag + '</a><br> ';
+					'\',\'add\')" class="pointer">#' + escapeHTML(tag) + '</a><br> ';
 				}else{
 					tags=tags+graphDraw(tag);
 				}
@@ -186,13 +186,13 @@ function graphDraw(tag){
 		var zero=50-(his[0].uses/max*50);
 		if(max===0){
 			tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">'+
-	'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
-			'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+	'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
+			'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
 		}else{
 			tags = '<br><br><svg version="1.1" viewbox="0 0 60 50" width="60" height="50">'+
 			'<g><path d="M0,'+six+' L10,'+five+' 20,'+four+' 30,'+three+' 40,'+two+' 50,'+one+' 60,'+zero+'" style="stroke: #9e9e9e; stroke-width: 1;fill: none;"></path></g>'+
-		'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + tag.name + '\',\'' + acct_id +
-				'\',\'add\')" class="pointer">#' + tag.name + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
+		'</svg><span style="font-size:200%">'+his[0].uses+'</span>toots&nbsp;<a onclick="tl(\'tag\',\'' + escapeHTML(tag.name) + '\',\'' + acct_id +
+				'\',\'add\')" class="pointer">#' + escapeHTML(tag.name) + '</a>&nbsp;'+his[0].accounts+lang.lang_src_people;
 		}
 		
 	return tags;

app/js/tl/tag.js

@@ -65,6 +65,7 @@ function favTag(){
             var ptt=lang.lang_tags_unrealtime;
             var nowon="("+lang.lang_tags_realtime+")";
         }
+        tag=escapeHTML(tag);
         tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a>'+nowon+'<span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag)+ '">TL</a>　<a onclick="brInsert(\'#' + tag + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">Toot</a>　'+
             '<a onclick="autoToot(\'' + tag + '\');" class="pointer" title="'+lang.lang_tags_always + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag) + '">'+ptt+'</a>　<a onclick="tagRemove(\'' + key + '\')" class="pointer" title="' +lang.lang_tags_tagunpin.replace("{{tag}}" ,'#'+tag)+ '">'+lang.lang_del+'</a></span> ';
     });
@@ -96,6 +97,7 @@ function trendTag(){
             var tags="";
             json=json.score;
             Object.keys(json).forEach(function(tag) {
+                tag=escapeHTML(tag);
                 tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span> ';
              });
              $("#taglist").append('<div class="trendtag">アイマストドントレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags+'</div>');
@@ -115,6 +117,7 @@ function tagTL(a,b,c,d){
     tl(a,b,acct_id,d);
 }
 function autoToot(tag){
+    tag=escapeHTML(tag)
     var nowPT=localStorage.getItem("stable")
     if(nowPT==tag){
         localStorage.removeItem("stable");

app/js/tl/tl.js

@@ -337,8 +337,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) {
 		return false;
 	};
 	websocket[wsid].onclose = function() {
-		console.error("Closing");
-		console.error(tlid);
+		console.log("Closing");
+		console.log(tlid);
 		if(mode=="error"){
 			$("#notice_icon_" + tlid).addClass("red-text");
 			todo('WebSocket Closed');
@@ -660,7 +660,7 @@ function cap(type, data, acct_id) {
 			var response="Federated TL(Media)";
 		}
 	} else if (type == "tag") {
-		var response= "#" + data
+		var response= "#" + escapeHTML(data)
 	} else if (type == "list") {
 		var ltitle=localStorage.getItem("list_"+data+"_"+acct_id);
 		var response= "List(" + ltitle + ")"
@@ -685,7 +685,7 @@ function cap(type, data, acct_id) {
 	}else if (type == "webview") {
 		var response="Twitter"
 	}else if (type == "tootsearch") {
-		var response="tootsearch(" + data + ")";
+		var response="tootsearch(" + escapeHTML(data) + ")";
 	}
 	return response;
 }
@@ -788,7 +788,7 @@ function strAliveInt(){
 }
 function reconnector(tlid,type,acct_id,data,mode){
 	console.log("Reconnector:"+mode)
-	if(type=="mix" || type=="plus"){
+	if(type=="mix" || type=="integrated" || type=="plus"){
 		if(localStorage.getItem("voice_" + tlid)){
 			var voice=true;
 		}else{
@@ -801,10 +801,11 @@ function reconnector(tlid,type,acct_id,data,mode){
 		}
 		var wssh=localStorage.getItem("wssH_" + tlid);
 		websocketHome[wssh].close();
-		var wssh=localStorage.getItem("wssL_" + tlid);
+		var wssl=localStorage.getItem("wssL_" + tlid);
 		websocketLocal[wssl].close();
 		mixre(acct_id, tlid, type, mute,"",voice,mode);
 	}else if(type=="notf"){
+		notfColumn(acct_id, tlid, "")
 	}else{
 		var wss=localStorage.getItem("wss_" + tlid);
 		websocket[wss].close();

app/js/ui/layout.js

@@ -28,6 +28,9 @@ function parseColumn() {
 		$(".toot-reset").css("font-size", size + "px");
 		$(".cont-series").css("font-size", size + "px");
 	}
+	if(localStorage.getItem("menu-done")){
+		$("#fukidashi").addClass("hide")
+	}
 	tlCloser();
 	var multi = localStorage.getItem("multi");
 	if (multi) {
@@ -153,15 +156,15 @@ function parseColumn() {
 			var animecss="";
 		}
 		if(acct.type=="notf"){
-			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fa fa-share exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fa fa-star exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fa fa-retweet exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fa fa-users exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fa fa-tasks exc-icons"></i></label> '+
+			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fas fa-share exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fas fa-star exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fas fa-retweet exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fas fa-users exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fas fa-tasks exc-icons"></i></label> '+
 			'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>';
 		}else if(acct.type=="home"){
 			var exclude='<a onclick="ebtToggle(' + key +
-			')" class="setting nex"><i class="fa fa-retweet waves-effect nex" title="'+lang.lang_layout_excludingbt +'" style="font-size:24px"></i><span id="sta-bt-' +
+			')" class="setting nex"><i class="fas fa-retweet waves-effect nex" title="'+lang.lang_layout_excludingbt +'" style="font-size:24px"></i><span id="sta-bt-' +
 			key + '">Off</span></a>'+lang.lang_layout_excludingbt+'<br>';
 		}else{
 			var exclude="";
@@ -198,8 +201,8 @@ function parseColumn() {
 		  key + '">On</span></a>'+lang.lang_layout_linkana +'<br><a onclick="voiceToggle(' + key +
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_tts +'">hearing</i><span id="sta-voice-' +
 		  key + '">On</span></a>'+lang.lang_layout_tts +'TL<br><a onclick="reconnector(' + key +
-		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
-			'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
+		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+escapeHTML(acct.data)+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
+			'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'" data-const="' + acct.type + '_'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div>'
 			$('#timeline_box_' + basekey + '_parentBox').append(html);
 		localStorage.removeItem("pool_" + key);
 		if (acct.data) {
@@ -445,7 +448,7 @@ function coloradd(key,bg,txt){
 function webviewParse(url,key,insert,icnsert,css){
 	var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
 			'" style="'+css+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
-			'<div class="area-notice"><i class="fa fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
+			'<div class="area-notice"><i class="fab fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
 			'<div class="area-notice_name tl-title">WebView('+url+')</div>'+
 			'<div class="area-sta"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">'+lang.lang_layout_webviewmode +'</label></div>'+
 			'<div class="area-a2"><a onclick="removeColumn(' + key +

app/js/ui/menu.js

@@ -1,4 +1,6 @@
 function menu(){
+    localStorage.setItem("menu-done",true);
+    $("#fukidashi").addClass("hide")
     if(!$("#menu").hasClass("appear")){
         $("#menu").addClass("appear")
         var left=localStorage.getItem("menu-left");

app/js/ui/settings.js

@@ -123,6 +123,10 @@ function load() {
 		var font = "";
 	}
 	$("#font").val(font);
+	$("#c1-file").text(localStorage.getItem("custom1"))
+	$("#c2-file").text(localStorage.getItem("custom2"));
+	$("#c3-file").text(localStorage.getItem("custom3"));
+	$("#c4-file").text(localStorage.getItem("custom4"));
 }
 
 function climute(){
@@ -636,6 +640,22 @@ ipc.on('theme-json-create-complete', function (event, args) {
 	$("#custom_import").val("");
 	ctLoad()
 });
+function customSound(key){
+	var electron = require("electron");
+	var remote=electron.remote;
+	var dialog=remote.dialog;
+	dialog.showOpenDialog(null, {
+		title: 'Custom sound',
+		properties: ['openFile'],
+		filters: [
+			{name: 'Audio', extensions: ['mp3','aac','wav','flac','m4a']},
+			{name: 'All', extensions: ['*']},
+		]
+	}, (fileNames) => {
+		localStorage.setItem("custom"+key,fileNames[0]);
+		$("#c1-file").text(fileNames[0])
+	});
+}
 window.onload = function() {
 	//最初に読む
 load();

app/js/ui/sort.js

@@ -32,7 +32,7 @@ function sortload(){
 				var acctdata=user+"@"+domain;
 			}
 			
-			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><div class="sorticon"><i class="material-icons">'+icon(acct.type)+'</i></div><div class="sorttitle">'+cap(acct.type, acct.data,acct.domain)+'</div><div class="sortaction"><a onclick="goColumn(' + key +
+			var html='<li class="drag-content" data-id="'+key+'" data-flag="'+flag+'"'+insert+'><div class="sorticon"><i class="material-icons">'+icon(acct.type)+'</i></div><div class="sorttitle">'+cap(acct.type, escapeHTML(acct.data),acct.domain)+'</div><div class="sortaction"><a onclick="goColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_sort_gothis+'">forward</i></a> <a onclick="removeColumn(' + key +
 			')" class="setting nex"><i class="material-icons waves-effect nex" title="このカラムを削除">cancel</i></a></div><div class="sortacct">'+acctdata+'</div></li>';
 			$("#sort").append(html);
@@ -103,7 +103,7 @@ function sort(){
 	var json = JSON.stringify(newobj);
 	localStorage.setItem("column", json);
 	$("#sort").html("");
-	Materialize.toast("並べ替え完了。", 3000);
+	Materialize.toast("Sorted", 3000);
 	sortload();
 	parseColumn();
 	sortMenu()

app/js/ui/spotify.js

@@ -129,6 +129,10 @@ function nowplaying(mode){
 
 	    ipc.send('itunes', "");
 	    ipc.once('itunes-np', function (event, arg) {
+            if (arg.cmd) {
+              console.error(arg);
+              return;
+            }
             console.log(arg);
             var content=localStorage.getItem("np-temp");
             if(!content || content=="" || content=="null"){
@@ -142,8 +146,8 @@ function nowplaying(mode){
                     media(arg.path,"image/png","new");
                 }
             }else if(platform=="darwin"){
-                if(flag && arg.artworks[0]){
-                    ipc.send('bmp-image', [arg.artworks[0].path,0]);
+                if(flag && arg.existsArtwork){
+                    media(arg.artworks[0].data,"image/png","new");
                 }
             }
             var regExp = new RegExp("{song}", "g");

app/js/ui/tips.js

@@ -57,7 +57,7 @@ function startmem(){
 		var use=arg[0];
 		var cpu=arg[1];
 		var total=arg[2]
-		$("#tips-text").html(cpu+"<br>Memory:"+Math.floor(use/1024/1024/102.4)/10+"/"+Math.floor(total/1024/1024/102.4)/10+"GB("+Math.floor(use/total*100)+"%)")
+		$("#tips-text").html(escapeHTML(cpu)+"<br>Memory:"+Math.floor(use/1024/1024/102.4)/10+"/"+Math.floor(total/1024/1024/102.4)/10+"GB("+Math.floor(use/total*100)+"%)")
 	})
 }
 //トレンドタグ
@@ -83,7 +83,7 @@ function trendTagonTip(){
             var tags="";
             json=json.score;
             Object.keys(json).forEach(function(tag) {
-                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + tag + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
+                tags = tags + '<a onclick="tagShow(\'' + tag + '\')" class="pointer">#' + escapeHTML(tag) + '</a><span class="hide" data-tag="' + tag + '">　<a onclick="tagTL(\'tag\',\'' + tag + '\',false,\'add\')" class="pointer" title="#' + tag + 'のタイムライン">TL</a>　<a onclick="show();brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span><br>';
              });
              $("#tips-text").html('<div class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTagonTip()" style="font-size:12px">refresh</i>:<br>' + tags+'</div>');
              trendTagonTipInterval()

app/js/userdata/his-data.js

@@ -553,6 +553,36 @@ function showFrl(more, acct_id) {
 
 	});
 }
+//Keybase
+function udAdd(start) {
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'Accept': 'application/json'
+		},
+		//body: JSON.stringify({})
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(json) {
+		var fields=json.attachment;
+		for(var i=0;i<fields.length;i++){
+			if(fields[i].type=="IdentityProof"){
+				if(fields[i].signatureAlgorithm=="keybase"){
+					var html='<a href="https://keybase.io/'+fields[i].name+'" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",escapeHTML(fields[i].signatureAlgorithm))+'"><i class="fas fa-key" aria-hidden="true"></i>'+escapeHTML(fields[i].signatureAlgorithm)+':'+escapeHTML(fields[i].name)+'</a>';
+				}else{
+					var html='<span class="cbadge teal" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",escapeHTML(fields[i].signatureAlgorithm))+'"><i class="fas fa-key" aria-hidden="true"></i>'+escapeHTML(fields[i].signatureAlgorithm)+':'+escapeHTML(fields[i].name)+'</span>';
+				}
+				$("#his-proof-prof").append(html)
+			}
+		}
+	});
+
+
+}
+
 
 //ユーザーマッチングリスト
 function showMat() {

app/js/userdata/showOnTL.js

@@ -105,6 +105,7 @@ function udg(user, acct_id) {
 			fer(json.id, '', acct_id);
 			var dis_name=escapeHTML(json.display_name);
 			dis_name=twemoji.parse(dis_name);
+
 			var note=json.note;
 			if(json.emojis){
 				var actemojick = json.emojis[0];
@@ -123,6 +124,12 @@ function udg(user, acct_id) {
 					note = note.replace(regExp, emoji_url);
 				});
 			}
+			//noteの解析
+			//var tags =  '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
+			//var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
+			//note=note.replace(/#(\S+)/gi, tags)
+			console.log(note)
+			//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
 			$("#his-name").html(dis_name);
 			$("#his-acct").text(json.acct);
 			$("#his-acct").attr("fullname",fullname);
@@ -150,8 +157,7 @@ function udg(user, acct_id) {
 							var when="";
 							var color="inherit"
 						}
-						fval=twemoji.parse(fval);
-						note=note+'<tr><td class="his-field-title">'+fname+'</td><td class="his-field-content" title="'+when+'" style="background-color:'+color+'">'+fval+'</td></tr>';
+						note=note+'<tr><td class="his-field-title">'+twemoji.parse(escapeHTML(fname))+'</td><td class="his-field-content" title="'+when+'" style="background-color:'+color+'">'+twemoji.parse(fval)+'</td></tr>';
 					}
 					note=note+'</table>'
 					$("#his-des").html(twemoji.parse(note));
@@ -164,6 +170,7 @@ function udg(user, acct_id) {
 			if(json.bot){
 				$("#his-bot").html(lang.lang_showontl_botacct);
 			}
+			$("#his-des").attr("data-acct",acct_id);
 			$('#his-data').css('background-size', 'cover');
 			$("#his-data .tab-content").css("height",$("#his-float-timeline").height()-70+"px")
 			localStorage.setItem("history" , user);
@@ -200,6 +207,8 @@ function udg(user, acct_id) {
 				$(".only-his-data").show();
 			}
 		todc();
+		//外部データ取得(死かもしれないので)
+		udAdd(json.url);
 	});
 }
 function misskeyUdg(user, acct_id) {
@@ -269,7 +278,7 @@ function misskeyUdg(user, acct_id) {
 			$("#his-follow").text(json.followingCount);
 			$("#his-follower").text(json.followersCount);
 			$("#his-since").text(crat(json.createdAt));
-			var note=json.description;
+			var note=escapeHTML(json.description);
 			$("#his-des").html(twemoji.parse(note));
 			if(json.isCat){
 				$("#his-bot").html("Cat"+twemoji.parse("😺"));
@@ -468,6 +477,7 @@ function reset(){
 	$("#his-openin").attr("data-href", "");
 	$("#his-float-timeline").show();
 	$("#his-float-blocked").hide();
+	$("#his-proof-prof").html("")
 }
 $('#my-data-nav .custom-tab').on('click',function(){
 	var target=$(this).find("a").attr("go");

app/main/np.js

@@ -4,7 +4,7 @@ function np(mainWindow){
     const app = electron.app;
     const fs = require("fs");
     var ipc = electron.ipcMain;
-    ipc.on('itunes', (e, args) => {
+    ipc.on('itunes', async (e, args) => {
         //Verified on Windows
         console.log("Access");
         if(args[0]=="set"){
@@ -25,13 +25,15 @@ function np(mainWindow){
             var platform=process.platform;
             var bit=process.arch;
             if(platform=="darwin"){
-            const nowplaying = require("itunes-nowplaying-mac")
-            nowplaying.getRawData().then(function (value) {
+              try {
+                const nowplaying = require("itunes-nowplaying-mac");
+                const value = await nowplaying.getRawData();
                 mainWindow.webContents.send('itunes-np', value);
-            }).catch(function (error) {
-                // 非同期処理失敗。呼ばれない
-                console.log(error);
-            });
+              } catch (error) {
+                // エラーを返す
+                console.error(error);
+                mainWindow.webContents.send('itunes-np', error);
+              }
             }else{
                 var {NowPlaying,PlayerName} = require("nowplaying-node");
                 var nppath=join(app.getPath("userData"), "nowplaying");

app/main/system.js

@@ -11,7 +11,6 @@ function system(mainWindow, dir, lang) {
 	const BrowserWindow = electron.BrowserWindow;
 	const dialog = electron.dialog;
 	const os = require('os')
-    const fm = require('font-manager');
     const language=require("../main/language.js");
 	ipc.on('native-notf', function(e, args) {
         
@@ -172,6 +171,7 @@ function system(mainWindow, dir, lang) {
 		fn(data); // ソート後の配列を返す
 	}
 	ipc.on('fonts', (e, arg) => {
+		const fm = require('font-manager');
 		var fonts = fm.getAvailableFontsSync();
 		object_array_sort(fonts, 'family', 'asc', function(fonts_sorted) {
 			mainWindow.webContents.send('font-list', fonts_sorted);

app/package.json

@@ -1,11 +1,13 @@
 {
   "name": "thedesk",
-  "version": "18.2.0",
+  "version": "18.3.1",
   "description": "TheDesk is a Mastodon client for PC.",
+  "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "dist": "build --linux snap",
+    "build": "electron-builder",
     "build:all": "electron-builder --win --linux",
     "build:win": "electron-builder --win"
   },
@@ -33,14 +35,13 @@
     },
     {
       "name": "kPherox",
-      "url": "https://www.kr-kp.com/",
+      "url": "https://pawoo.net/@kPherox",
       "email": "admin@mail.kr-kp.com"
     }
   ],
   "license": "GPL-3.0",
   "dependencies": {
     "electron-dl": "^1.11.0",
-    "font-manager": "^0.3.0",
     "jimp": "^0.2.28",
     "json5": "^2.1.0",
     "node-notifier": "^5.2.1",
@@ -49,11 +50,15 @@
   },
   "optionalDependencies": {
     "nowplaying-node": "^0.1.3",
-    "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/1/head"
+    "itunes-nowplaying-mac": "git+https://github.com/rinsuki/itunes-nowplaying-mac#pull/4/head",
+    "font-manager": "^0.3.0"
   },
   "build": {
     "productName": "TheDesk",
     "appId": "top.thedesk",
+    "asarUnpack": [
+      "node_modules/itunes-nowplaying-mac"
+    ],
     "directories": {
       "output": "../build"
     },
@@ -83,21 +88,21 @@
     "linux": {
       "icon": "build/icons",
       "target": [
+        "zip",
         "snap"
       ],
       "category": "Network"
     },
     "mac": {
-      "target": "dmg"
+      "target": ["dmg","zip"]
     },
     "electronDownload": {
-      "version": "4.0.6"
+      "version": "4.1.4"
     },
-    "electronVersion": "4.0.6"
+    "electronVersion": "4.1.4"
   },
   "devDependencies": {
-    "electron": "^4.0.6",
-    "electron-packager": "^13.1.1",
-    "electron-rebuild": "^1.8.4"
+    "electron": "^4.1.4",
+    "electron-builder": "^20.39.0"
   }
 }

app/view/en/index.html

@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	<!--
@@ -32,7 +32,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="Usamin (18.2.0)";
+var ver="Usamin (18.3.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -249,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -270,7 +270,7 @@ var tlid=0;
 			<label for="poll-until">Hide 'votes' count until people vote it.</label><br>
 			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">day(s)
 			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hour(s)
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">minute(s)
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">minute(s)
 		</div>
 	</div>
 </div>
@@ -324,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>People who boosted it
+		<i class="text-darken-3 false fas fa-retweet"></i>People who boosted it
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	Use other account(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>:unfav and unBT are disabled.)<br>
+	Use other account(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>:unfav and unBT are disabled.)<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -383,8 +383,9 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">Emphasize this user</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
@@ -579,22 +580,17 @@ var tlid=0;
 		<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-Usamin_18-2-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-1" class="release-do" 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に関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.2.0)</h5>
-・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・イントロダクション(初回起動時)の挙動修正<br>
-・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・(Misskey)MFM追加flipやjumpなど<br>
-・(Misskey)リストに対応<br>
-・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
-・一部機能の統廃合とバグの修正<br>
-・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
+・バグと脆弱性の修正
+<br>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -603,9 +599,6 @@ var tlid=0;
 			<br><br>
 			<h3>Support TheDesk!</h3>
 			TheDesk has no ad, you need no charge to unlock premium features. We need your friendly support!<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
-  				Support on Enty
-			</a>
 			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
 				Support on Pixiv FANBOX
 		</a>
@@ -809,6 +802,7 @@ var tlid=0;
 							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
 									<i class="material-icons" title="List">apps</i>
 							</a>
+							<span id="fukidashi"><- Add TL</span>
 						</div>
     </div></div>
     <div>
@@ -827,7 +821,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>

app/view/en/setting.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" style="overflow:scroll">
 
 <head>
 	<title>Settings - TheDesk</title>
@@ -22,7 +22,6 @@
 		input {
 			max-height: 50px !important
 		}
-
 		.pcr-result {
 			height: 1rem !important;
 		}
@@ -56,8 +55,8 @@
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.id=='notf'"><a onclick="notftest()"
 								class="pointer">Notification test</a><br></template>
@@ -85,7 +84,7 @@
 					</template>
 				</div>
 				<h5>Font</h5>
-				Select your favorite font to 'Select'<br>
+				Select your favorite font to 'Select'(Windows/ macOS only)<br>
 				<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
 				<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
 				<br>
@@ -131,9 +130,9 @@
 				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
 						placeholder="About this theme..."></textarea></div>
 				<h5>Color scheme</h5>
-				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
-				<input class="with-gap" name="derection" type="radio" id="light" value="light" />
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
 				<label for="light">Light</label>
 				<div id="pickers">
 					<div>
@@ -158,11 +157,11 @@
 						<input type="hidden" id="color-picker2_value">
 					</div>
 					<div>
-						<h5>Accent</h5>Background of boosts
-						<div id="color-picker3-wrap">
-							<div class="color-picker" id="color-picker3"></div>
-						</div>
-						<input type="hidden" id="color-picker3_value">
+					<h5>Accent</h5>Background of boosts
+					<div id="color-picker3-wrap">
+						<div class="color-picker" id="color-picker3"></div>
+					</div>
+					<input type="hidden" id="color-picker3_value">
 					</div>
 				</div>
 				<button class="btn-large waves-effect" onclick="customComp()">Change</button>&nbsp;<button
@@ -184,8 +183,8 @@
 				<div id="tlView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -210,6 +209,11 @@
 						</template><br>
 					</template>
 				</div>
+				<h5>Custom sound</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
 			</div>
 		</li>
 		<li>
@@ -220,8 +224,8 @@
 				<div id="postView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -253,7 +257,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="material-icons">Fkeyboard</i>Keyboard shortcut Preferences
+				<i class="material-icons">keyboard</i>Keyboard shortcut Preferences
 			</div>
 			<div class="collapsible-body">
 				<h5>Easy inserter</h5>
@@ -403,8 +407,6 @@
 			class="material-icons left">info</i>About TheDesk</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>Website</a>
-	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-			class="material-icons left">trending_up</i>Support(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>Support(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
@@ -420,7 +422,7 @@
 	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer">Check update</a><br>
 	<a href="oss.html">OSS License</a><br>
-	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+	<span style="font-family:Open Sans;">Copyright &copy; Cutls P 2018 All Rights Reserved.
 		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>

app/view/en/setting.vue.js

@@ -7,6 +7,27 @@ var yesno=[
         value:"no"
     }
 ];
+var sound=[
+    {
+        text:"None",
+        value:"none"
+    },{
+        text:"Default",
+        value:"default"
+    },{
+        text:"Custom 1",
+        value:"c1"
+    },{
+        text:"Custom 2",
+        value:"c2"
+    },{
+        text:"Custom 3",
+        value:"c3"
+    },{
+        text:"Custom 4",
+        value:"c4"
+    }
+];
 var envConstruction=[
     {
         id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
             desc:"",
             checkbox:yesno
         }
+    },{
+        id:"replySound",
+        storage:"replySound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"Sound(Reply)",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"favSound",
+        storage:"favSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"Sound(Fav)",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"btSound",
+        storage:"btSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"Sound(Boost)",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"followSound",
+        storage:"followSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"Sound(Follow)",
+            desc:"",
+            checkbox:sound
+        }
     }
 ];
 var postConstruction=[

app/view/en/update.html

@@ -197,10 +197,24 @@ function verck(){
         todo(error);
 		console.error(error);
     }).then(function(json) {
-		    console.log(json);
-             $("#ver").text(json.desk);
-             localStorage.setItem("next-ver",json.desk);
-			 $("#det").html(json.detail);
+            console.log(json);
+            if(platform=="win32"){
+                $("#ver").text(json.desk);
+                localStorage.setItem("next-ver",json.desk);
+	        }else if(platform=="linux"){
+                $("#ver").text(json.desk_linux);
+                localStorage.setItem("next-ver",json.desk_linux);
+	        }else if(platform=="darwin"){
+                $("#ver").text(json.desk_mac);
+                localStorage.setItem("next-ver",json.desk_mac);
+            }
+            var lang="en";
+            if(lang=="ja"){
+                $("#det").html(json.detail);
+            }else{
+                $("#det").html(json.detail_en);
+            }
+			 
              $("#now").text(localStorage.getItem("ver"));
              
     });

app/view/ja/index.html

@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	<!--
@@ -32,7 +32,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="Usamin (18.2.0)";
+var ver="Usamin (18.3.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -249,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -270,7 +270,7 @@ var tlid=0;
 			<label for="poll-until">投票するまで票数を隠す</label><br>
 			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">日
 			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">時間
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">分
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">分
 		</div>
 	</div>
 </div>
@@ -324,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>このトゥートをブーストした人
+		<i class="text-darken-3 false fas fa-retweet"></i>このトゥートをブーストした人
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	他のアカウントを使用(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>の解除はできません)<br>
+	他のアカウントを使用(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>の解除はできません)<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -383,8 +383,9 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">ユーザー強調</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">紹介する</a><br>
@@ -579,22 +580,17 @@ var tlid=0;
 		<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-Usamin_18-2-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-1" class="release-do" 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に関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.2.0)</h5>
-・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・イントロダクション(初回起動時)の挙動修正<br>
-・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・(Misskey)MFM追加flipやjumpなど<br>
-・(Misskey)リストに対応<br>
-・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
-・一部機能の統廃合とバグの修正<br>
-・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
+・バグと脆弱性の修正
+<br>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -603,9 +599,6 @@ var tlid=0;
 			<br><br>
 			<h3>ご支援ください。</h3>
 			TheDeskは営利目的ではないため、有料機能や広告は一切ありません。<br>皆様のあたたかいご支援のもとで製作されています。<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
-  				Entyで支援
-			</a>
 			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
 				Pixiv FANBOXで支援
 		</a>
@@ -809,6 +802,7 @@ var tlid=0;
 							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
 									<i class="material-icons" title="リスト">apps</i>
 							</a>
+							<span id="fukidashi">←ここからTL追加</span>
 						</div>
     </div></div>
     <div>
@@ -827,7 +821,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>

app/view/ja/setting.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="ja">
+<html lang="ja" style="overflow:scroll">
 
 <head>
 	<title>Settings - TheDesk</title>
@@ -22,7 +22,6 @@
 		input {
 			max-height: 50px !important
 		}
-
 		.pcr-result {
 			height: 1rem !important;
 		}
@@ -56,8 +55,8 @@
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.id=='notf'"><a onclick="notftest()"
 								class="pointer">通知テスト</a><br></template>
@@ -85,7 +84,7 @@
 					</template>
 				</div>
 				<h5>フォント</h5>
-				「選択」を押してフォントを選んでください。<br>
+				「選択」を押してフォントを選んでください。(Linuxでは動きません)<br>
 				<button class="btn waves-effect" style="width:100px;" onclick="font()">選択</button><br>
 				<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
 				<br>
@@ -131,9 +130,9 @@
 				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
 						placeholder="説明..."></textarea></div>
 				<h5>色の系統</h5>
-				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
-				<input class="with-gap" name="derection" type="radio" id="light" value="light" />
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
 				<label for="light">Light</label>
 				<div id="pickers">
 					<div>
@@ -158,11 +157,11 @@
 						<input type="hidden" id="color-picker2_value">
 					</div>
 					<div>
-						<h5>Accent</h5>ブーストの背景色など
-						<div id="color-picker3-wrap">
-							<div class="color-picker" id="color-picker3"></div>
-						</div>
-						<input type="hidden" id="color-picker3_value">
+					<h5>Accent</h5>ブーストの背景色など
+					<div id="color-picker3-wrap">
+						<div class="color-picker" id="color-picker3"></div>
+					</div>
+					<input type="hidden" id="color-picker3_value">
 					</div>
 				</div>
 				<button class="btn-large waves-effect" onclick="customComp()">変更</button>&nbsp;<button
@@ -184,8 +183,8 @@
 				<div id="tlView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -210,6 +209,11 @@
 						</template><br>
 					</template>
 				</div>
+				<h5>カスタム通知音</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
 			</div>
 		</li>
 		<li>
@@ -220,8 +224,8 @@
 				<div id="postView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -253,7 +257,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="material-icons">Fkeyboard</i>キーボードショートカットの設定
+				<i class="material-icons">keyboard</i>キーボードショートカットの設定
 			</div>
 			<div class="collapsible-body">
 				<h5>簡単文字入力</h5>
@@ -403,8 +407,6 @@
 			class="material-icons left">info</i>このソフトについて</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>公式HP</a>
-	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-			class="material-icons left">trending_up</i>支援(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>支援(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
@@ -420,7 +422,7 @@
 	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer">アップデートを確認</a><br>
 	<a href="oss.html">OSS License(オープンソースライセンス)</a><br>
-	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+	<span style="font-family:Open Sans;">Copyright &copy; Cutls P 2018 All Rights Reserved.
 		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>

app/view/ja/setting.vue.js

@@ -7,6 +7,27 @@ var yesno=[
         value:"no"
     }
 ];
+var sound=[
+    {
+        text:"なし",
+        value:"none"
+    },{
+        text:"既定",
+        value:"default"
+    },{
+        text:"Custom 1",
+        value:"c1"
+    },{
+        text:"Custom 2",
+        value:"c2"
+    },{
+        text:"Custom 3",
+        value:"c3"
+    },{
+        text:"Custom 4",
+        value:"c4"
+    }
+];
 var envConstruction=[
     {
         id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
             desc:"",
             checkbox:yesno
         }
+    },{
+        id:"replySound",
+        storage:"replySound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"リプライの通知音",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"favSound",
+        storage:"favSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"お気に入り登録の通知音",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"btSound",
+        storage:"btSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"ブーストの通知音",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"followSound",
+        storage:"followSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"フォローの通知音",
+            desc:"",
+            checkbox:sound
+        }
     }
 ];
 var postConstruction=[

app/view/ja/update.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="ja">
 <head>
 <title>Update - TheDesk</title>
 <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
@@ -197,10 +197,24 @@ function verck(){
         todo(error);
 		console.error(error);
     }).then(function(json) {
-		    console.log(json);
-             $("#ver").text(json.desk);
-             localStorage.setItem("next-ver",json.desk);
-			 $("#det").html(json.detail);
+            console.log(json);
+            if(platform=="win32"){
+                $("#ver").text(json.desk);
+                localStorage.setItem("next-ver",json.desk);
+	        }else if(platform=="linux"){
+                $("#ver").text(json.desk_linux);
+                localStorage.setItem("next-ver",json.desk_linux);
+	        }else if(platform=="darwin"){
+                $("#ver").text(json.desk_mac);
+                localStorage.setItem("next-ver",json.desk_mac);
+            }
+            var lang="ja";
+            if(lang=="ja"){
+                $("#det").html(json.detail);
+            }else{
+                $("#det").html(json.detail_en);
+            }
+			 
              $("#now").text(localStorage.getItem("ver"));
              
     });

app/view/make/index.sample.html

@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	{{comment-start}}
@@ -249,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -270,7 +270,7 @@ var tlid=0;
 			<label for="poll-until">{{polluntil}}</label><br>
 			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">{{days}}
 			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">{{hours}}
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">{{mins}}
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">{{mins}}
 		</div>
 	</div>
 </div>
@@ -324,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>{{btedPeople}}
+		<i class="text-darken-3 false fas fa-retweet"></i>{{btedPeople}}
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	{{useOtherAcct1}}(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>{{useOtherAcct2}})<br>
+	{{useOtherAcct1}}(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>{{useOtherAcct2}})<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -383,8 +383,9 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">{{empUser}}</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">{{endorse}}</a><br>
@@ -579,22 +580,17 @@ var tlid=0;
 		<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-Usamin_18-2-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-1" class="release-do" 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に関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.2.0)</h5>
-・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・イントロダクション(初回起動時)の挙動修正<br>
-・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・(Misskey)MFM追加flipやjumpなど<br>
-・(Misskey)リストに対応<br>
-・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
-・一部機能の統廃合とバグの修正<br>
-・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
+・バグと脆弱性の修正
+<br>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -603,9 +599,6 @@ var tlid=0;
 			<br><br>
 			<h3>{{supportme}}</h3>
 			{{TheDeskDes}}<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
-  				{{EntySupport}}
-			</a>
 			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
 				{{PixivSupport}}
 		</a>
@@ -809,6 +802,7 @@ var tlid=0;
 							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
 									<i class="material-icons" title="{{list}}">apps</i>
 							</a>
+							<span id="fukidashi">{{hereAddColumns}}</span>
 						</div>
     </div></div>
     <div>
@@ -827,7 +821,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>

app/view/make/language/index.en.json

@@ -158,5 +158,6 @@
     "ramTips":"RAM status",
     "changeTips":"Change Tips",
     "help":"Help",
-    "about":"About TheDesk"
+    "about":"About TheDesk",
+    "hereAddColumns":"<- Add TL"
 }

app/view/make/language/index.ja.json

@@ -158,5 +158,6 @@
     "ramTips":"システムメモリ容量",
     "changeTips":"Tips変更",
     "help":"ヘルプ",
-    "about":"このソフトについて"
+    "about":"このソフトについて",
+    "hereAddColumns":"←ここからTL追加"
 }

app/view/make/language/setting.en.json

@@ -3,6 +3,8 @@
     "set":"Save",
     "yes":"Yes",
     "no":"No",
+    "none":"None",
+    "default":"Default",
     "change":"Change",
     "select":"Select",
     "env":"System Preferences",
@@ -25,7 +27,7 @@
     "fixwidthwarn":"",
     "above":"above",
     "font":"Font",
-    "fontwarn":"Select your favorite font to 'Select'",
+    "fontwarn":"Select your favorite font to 'Select'(Windows/ macOS only)",
     "fontsize":"Font size",
     "savefolder":"Folder to save",
     "savefolderwarn":"TheDesk uses this value when it try to save pictures or take screenshots.",
@@ -85,6 +87,11 @@
     "ticker":"Enable #InstanceTicker",
     "tickerwarn":"Show colorful stickers about the server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
     "animation":"Animation of timelines",
+    "replySound":"Sound(Reply)",
+    "favSound":"Sound(Fav)",
+    "btSound":"Sound(Boost)",
+    "followSound":"Sound(Follow)",
+    "customSound":"Custom sound",
     "post":"Posting Preferences",
     "autocw":"Alert before posting a long toot.",
     "autocwwarn":"Show dialog whether you make too-long text hidden.",

app/view/make/language/setting.ja.json

@@ -3,6 +3,8 @@
     "set":"設定",
     "yes":"はい",
     "no":"いいえ",
+    "none":"なし",
+    "default":"既定",
     "change":"変更",
     "select":"選択",
     "env":"環境設定",
@@ -25,7 +27,7 @@
     "fixwidthwarn":"",
     "above":"以上",
     "font":"フォント",
-    "fontwarn":"「選択」を押してフォントを選んでください。",
+    "fontwarn":"「選択」を押してフォントを選んでください。(Linuxでは動きません)",
     "fontsize":"フォントサイズ",
     "savefolder":"デフォルトの保存先",
     "savefolderwarn":"画像ダウンロードやスクリーンショットに影響します。",
@@ -85,6 +87,11 @@
     "ticker":"#InstanceTickerを使う",
     "tickerwarn":"トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://cdn.weep.me/mastodon/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
     "animation":"タイムラインのアニメーション",
+    "replySound":"リプライの通知音",
+    "favSound":"お気に入り登録の通知音",
+    "btSound":"ブーストの通知音",
+    "followSound":"フォローの通知音",
+    "customSound":"カスタム通知音",
     "post":"投稿設定",
     "autocw":"長文投稿時に警告",
     "autocwwarn":"下で指定した以上のトゥートを投稿するときにCWするかのダイアログを表示します。",

app/view/make/setting.sample.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="@@lang@@">
+<html lang="@@lang@@" style="overflow:scroll">
 
 <head>
 	<title>Settings - TheDesk</title>
@@ -22,7 +22,6 @@
 		input {
 			max-height: 50px !important
 		}
-
 		.pcr-result {
 			height: 1rem !important;
 		}
@@ -56,8 +55,8 @@
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.id=='notf'"><a onclick="notftest()"
 								class="pointer">@@nntest@@</a><br></template>
@@ -131,9 +130,9 @@
 				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
 						placeholder="@@desc@@..."></textarea></div>
 				<h5>@@customthemeDirection@@</h5>
-				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
-				<input class="with-gap" name="derection" type="radio" id="light" value="light" />
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
 				<label for="light">Light</label>
 				<div id="pickers">
 					<div>
@@ -158,11 +157,11 @@
 						<input type="hidden" id="color-picker2_value">
 					</div>
 					<div>
-						<h5>Accent</h5>@@accent@@
-						<div id="color-picker3-wrap">
-							<div class="color-picker" id="color-picker3"></div>
-						</div>
-						<input type="hidden" id="color-picker3_value">
+					<h5>Accent</h5>@@accent@@
+					<div id="color-picker3-wrap">
+						<div class="color-picker" id="color-picker3"></div>
+					</div>
+					<input type="hidden" id="color-picker3_value">
 					</div>
 				</div>
 				<button class="btn-large waves-effect" onclick="customComp()">@@change@@</button>&nbsp;<button
@@ -184,8 +183,8 @@
 				<div id="tlView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -210,6 +209,11 @@
 						</template><br>
 					</template>
 				</div>
+				<h5>@@customSound@@</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
 			</div>
 		</li>
 		<li>
@@ -220,8 +224,8 @@
 				<div id="postView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -253,7 +257,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="material-icons">Fkeyboard</i>@@keysc@@
+				<i class="material-icons">keyboard</i>@@keysc@@
 			</div>
 			<div class="collapsible-body">
 				<h5>@@iks@@</h5>
@@ -403,8 +407,6 @@
 			class="material-icons left">info</i>@@about@@</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>@@hp@@</a>
-	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-			class="material-icons left">trending_up</i>@@support@@(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>@@support@@(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
@@ -420,7 +422,7 @@
 	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer">@@checkup@@</a><br>
 	<a href="oss.html">OSS License@@ossJP@@</a><br>
-	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+	<span style="font-family:Open Sans;">Copyright &copy; Cutls P 2018 All Rights Reserved.
 		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>

app/view/make/setting.sample.js

@@ -7,6 +7,27 @@ var yesno=[
         value:"no"
     }
 ];
+var sound=[
+    {
+        text:"@@none@@",
+        value:"none"
+    },{
+        text:"@@default@@",
+        value:"default"
+    },{
+        text:"Custom 1",
+        value:"c1"
+    },{
+        text:"Custom 2",
+        value:"c2"
+    },{
+        text:"Custom 3",
+        value:"c3"
+    },{
+        text:"Custom 4",
+        value:"c4"
+    }
+];
 var envConstruction=[
     {
         id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
             desc:"",
             checkbox:yesno
         }
+    },{
+        id:"replySound",
+        storage:"replySound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@replySound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"favSound",
+        storage:"favSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@favSound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"btSound",
+        storage:"btSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@btSound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"followSound",
+        storage:"followSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@followSound@@",
+            desc:"",
+            checkbox:sound
+        }
     }
 ];
 var postConstruction=[

app/view/make/update.sample.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="{{lang}}">
 <head>
 <title>Update - TheDesk</title>
 <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
@@ -197,10 +197,24 @@ function verck(){
         todo(error);
 		console.error(error);
     }).then(function(json) {
-		    console.log(json);
-             $("#ver").text(json.desk);
-             localStorage.setItem("next-ver",json.desk);
-			 $("#det").html(json.detail);
+            console.log(json);
+            if(platform=="win32"){
+                $("#ver").text(json.desk);
+                localStorage.setItem("next-ver",json.desk);
+	        }else if(platform=="linux"){
+                $("#ver").text(json.desk_linux);
+                localStorage.setItem("next-ver",json.desk_linux);
+	        }else if(platform=="darwin"){
+                $("#ver").text(json.desk_mac);
+                localStorage.setItem("next-ver",json.desk_mac);
+            }
+            var lang="{{lang}}";
+            if(lang=="ja"){
+                $("#det").html(json.detail);
+            }else{
+                $("#det").html(json.detail_en);
+            }
+			 
              $("#now").text(localStorage.getItem("ver"));
              
     });

app/view/ps/index.html

@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	
@@ -32,7 +32,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="Usamin (18.2.0)";
+var ver="Usamin (18.3.1)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
@@ -249,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -270,7 +270,7 @@ var tlid=0;
 			<label for="poll-until">crwdns2412:0crwdne2412:0</label><br>
 			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">crwdns507:0crwdne507:0
 			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">crwdns508:0crwdne508:0
-			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">crwdns509:0crwdne509:0
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="6">crwdns509:0crwdne509:0
 		</div>
 	</div>
 </div>
@@ -324,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>crwdns429:0crwdne429:0
+		<i class="text-darken-3 false fas fa-retweet"></i>crwdns429:0crwdne429:0
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	crwdns430:0crwdne430:0(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>crwdns431:0crwdne431:0)<br>
+	crwdns430:0crwdne430:0(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>crwdns431:0crwdne431:0)<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -383,8 +383,9 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">crwdns472:0crwdne472:0</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">crwdns454:0crwdne454:0</a><br>
@@ -579,22 +580,17 @@ var tlid=0;
 		<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-Usamin_18-2-0" class="release-do" style="display:none; ">
+			<div id="release-Usamin_18-3-1" class="release-do" 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に関する記事をご覧いただけます。<br>
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-					<h5>Release Note Usamin (18.2.0)</h5>
-・tootsearchをひとつのカラムにしてエゴサが捗る<br>
-・イントロダクション(初回起動時)の挙動修正<br>
-・リンクプレビューを最大1行ずつに省略(タイトルと本文)<br>
-・ブロックされたときのプロフィールの動作(Mastodon 2.8~)<br>
-・(Misskey)MFM追加flipやjumpなど<br>
-・(Misskey)リストに対応<br>
-・(Misskey)カスタム絵文字に対応。カスタム絵文字によるリアクションに対応(対応インスタンスに限る)。<br>
-・<b>カスタム絵文字をゼロ幅スペースによる挿入に変更する機能</b><br>
-・一部機能の統廃合とバグの修正<br>
-・best-friends.chatやキュアスタ！、misskey.devをサポートインスタンスに追加
+					<h5>Release Note Usamin (18.3.1)</h5>
+・通知音が種別ごとに追加(すべて適当に自分で打ったやつです。)<br>
+・Integrated TLのタイムラインの再接続(kPherox)<br>
+・一部ロケーションの変更や投票に関するバグ(kPherox)<br>
+・バグと脆弱性の修正
+<br>
 			</div>
 			<div id="release-en">
 				<h5>Let's make it native!</h5>
@@ -603,9 +599,6 @@ var tlid=0;
 			<br><br>
 			<h3>crwdns473:0crwdne473:0</h3>
 			crwdns474:0crwdne474:0<br>
-			<a class="btn-share btn waves-effect waves-light purple lighten-2" href="https://enty.jp/Cutls" target="_blank">
-  				crwdns475:0crwdne475:0
-			</a>
 			<a class="btn-share btn waves-effect waves-light red lighten-2" href="https://www.pixiv.net/fanbox/creator/28105985" target="_blank">
 				{{PixivSupport}}
 		</a>
@@ -809,6 +802,7 @@ var tlid=0;
 							<a onclick="menu()" class="nex waves-effect" id="list-tgl">
 									<i class="material-icons" title="crwdns444:0crwdne444:0">apps</i>
 							</a>
+							<span id="fukidashi">{{hereAddColumns}}</span>
 						</div>
     </div></div>
     <div>
@@ -827,7 +821,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>

app/view/ps/setting.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="ps">
+<html lang="ps" style="overflow:scroll">
 
 <head>
 	<title>Settings - TheDesk</title>
@@ -22,7 +22,6 @@
 		input {
 			max-height: 50px !important
 		}
-
 		.pcr-result {
 			height: 1rem !important;
 		}
@@ -56,8 +55,8 @@
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.id=='notf'"><a onclick="notftest()"
 								class="pointer">crwdns540:0crwdne540:0</a><br></template>
@@ -131,9 +130,9 @@
 				<div class="input-field"><textarea style="width:300px" id="custom_desc" class="materialize-textarea"
 						placeholder="crwdns2440:0crwdne2440:0..."></textarea></div>
 				<h5>crwdns2426:0crwdne2426:0</h5>
-				<input class="with-gap" name="derection" type="radio" id="dark" value="dark" checked="true" />
+				<input class="with-gap" name="direction" type="radio" id="dark" value="dark" checked="true" />
 				<label for="dark">Dark</label>
-				<input class="with-gap" name="derection" type="radio" id="light" value="light" />
+				<input class="with-gap" name="direction" type="radio" id="light" value="light" />
 				<label for="light">Light</label>
 				<div id="pickers">
 					<div>
@@ -158,11 +157,11 @@
 						<input type="hidden" id="color-picker2_value">
 					</div>
 					<div>
-						<h5>Accent</h5>crwdns2434:0crwdne2434:0
-						<div id="color-picker3-wrap">
-							<div class="color-picker" id="color-picker3"></div>
-						</div>
-						<input type="hidden" id="color-picker3_value">
+					<h5>Accent</h5>crwdns2434:0crwdne2434:0
+					<div id="color-picker3-wrap">
+						<div class="color-picker" id="color-picker3"></div>
+					</div>
+					<input type="hidden" id="color-picker3_value">
 					</div>
 				</div>
 				<button class="btn-large waves-effect" onclick="customComp()">crwdns528:0crwdne528:0</button>&nbsp;<button
@@ -184,8 +183,8 @@
 				<div id="tlView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -210,6 +209,11 @@
 						</template><br>
 					</template>
 				</div>
+				<h5>@@customSound@@</h5>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(1)">Custom 1</button><span id="c1-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(2)">Custom 2</button><span id="c2-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(3)">Custom 3</button><span id="c3-file"></span><br>
+				<button class="btn waves-effect" style="width:120px;" onclick="customSound(4)">Custom 4</button><span id="c4-file"></span><br>
 			</div>
 		</li>
 		<li>
@@ -220,8 +224,8 @@
 				<div id="postView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>
-						<template v-if=item.text.desc>
-							<templete v-html=item.text.desc></templete><br>
+						<template v-if="item.text.desc">
+							<templete v-html="item.text.desc"></templete><br>
 						</template>
 						<template v-if="item.checkbox">
 							<template v-for="(check, j) in item.text.checkbox">
@@ -253,7 +257,7 @@
 		</li>
 		<li>
 			<div class="collapsible-header">
-				<i class="material-icons">Fkeyboard</i>crwdns611:0crwdne611:0
+				<i class="material-icons">keyboard</i>crwdns611:0crwdne611:0
 			</div>
 			<div class="collapsible-body">
 				<h5>crwdns612:0crwdne612:0</h5>
@@ -403,8 +407,6 @@
 			class="material-icons left">info</i>crwdns662:0crwdne662:0</button>
 	<a href="https://thedesk.top" class="btn waves-effect deep-purple lighten-2" style="width:100%; max-width:500px;"><i
 			class="material-icons left">web</i>crwdns663:0crwdne663:0</a>
-	<a href="https://enty.jp/Cutls" class="btn waves-effect purple lighten-2" style="width:100%; max-width:500px;"><i
-			class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Enty)</a>
 	<a href="https://www.pixiv.net/fanbox/creator/28105985" class="btn waves-effect red lighten-2"
 		style="width:100%; max-width:500px;"><i class="material-icons left">trending_up</i>crwdns664:0crwdne664:0(Pixiv FANBOX)</a>
 	<a href="https://docs.thedesk.top" class="btn waves-effect blue darken-2" style="width:100%; max-width:500px;"><i
@@ -420,7 +422,7 @@
 	<a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';"
 		class="pointer">crwdns667:0crwdne667:0</a><br>
 	<a href="oss.html">OSS Licensecrwdns668:0crwdne668:0</a><br>
-	<span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved.
+	<span style="font-family:Open Sans;">Copyright &copy; Cutls P 2018 All Rights Reserved.
 		Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a
 			href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy
 			Policy</a>

app/view/ps/setting.vue.js

@@ -7,6 +7,27 @@ var yesno=[
         value:"no"
     }
 ];
+var sound=[
+    {
+        text:"@@none@@",
+        value:"none"
+    },{
+        text:"@@default@@",
+        value:"default"
+    },{
+        text:"Custom 1",
+        value:"c1"
+    },{
+        text:"Custom 2",
+        value:"c2"
+    },{
+        text:"Custom 3",
+        value:"c3"
+    },{
+        text:"Custom 4",
+        value:"c4"
+    }
+];
 var envConstruction=[
     {
         id:"popup",
@@ -286,6 +307,46 @@ var tlConstruction=[
             desc:"",
             checkbox:yesno
         }
+    },{
+        id:"replySound",
+        storage:"replySound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@replySound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"favSound",
+        storage:"favSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@favSound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"btSound",
+        storage:"btSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@btSound@@",
+            desc:"",
+            checkbox:sound
+        }
+    },{
+        id:"followSound",
+        storage:"followSound",
+        checkbox:true,
+        setValue:"none",
+        text:{
+            head:"@@followSound@@",
+            desc:"",
+            checkbox:sound
+        }
     }
 ];
 var postConstruction=[

app/view/ps/update.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html lang="ps">
 <head>
 <title>Update - TheDesk</title>
 <link href="../../css/materialize.css" type="text/css" rel="stylesheet">
@@ -197,10 +197,24 @@ function verck(){
         todo(error);
 		console.error(error);
     }).then(function(json) {
-		    console.log(json);
-             $("#ver").text(json.desk);
-             localStorage.setItem("next-ver",json.desk);
-			 $("#det").html(json.detail);
+            console.log(json);
+            if(platform=="win32"){
+                $("#ver").text(json.desk);
+                localStorage.setItem("next-ver",json.desk);
+	        }else if(platform=="linux"){
+                $("#ver").text(json.desk_linux);
+                localStorage.setItem("next-ver",json.desk_linux);
+	        }else if(platform=="darwin"){
+                $("#ver").text(json.desk_mac);
+                localStorage.setItem("next-ver",json.desk_mac);
+            }
+            var lang="ps";
+            if(lang=="ja"){
+                $("#det").html(json.detail);
+            }else{
+                $("#det").html(json.detail_en);
+            }
+			 
              $("#now").text(localStorage.getItem("ver"));
              
     });

trial.travis.yml

@@ -1,27 +1,11 @@
-language: objective-c
-cache:
-  directories:
-    - node_modules
-env:
-  - NODE_VERSION="9.9.0"
-before_install:
-  # nvm をインストールする。Travis の OS X 環境には nvm はデフォルトで入っていない
-  - git clone https://github.com/creationix/nvm.git /tmp/.nvm
-  - source /tmp/.nvm/nvm.sh
-  # 指定バージョンの Node をインストールする
-  - nvm install $NODE_VERSION
-  # 指定バージョンの Node を有効にする
-  - nvm use --delete-prefix $NODE_VERSION
-  - node --version
-script:
-  - node --version
+os: windows
+language: node_js
+node_js:
+- '10.15.2'
+script: node -v
 before_deploy:
-  - brew update
-  - brew install wine
-  - wine --version
-  - brew install makensis
-  - npm install electron-builder -g
   - cd app
+  - npm install electron-builder -g
   - npm install
   - electron-builder --win --ia32
   - mv ../build/TheDesk-setup.exe ../TheDesk-setup-ia32.exe
@@ -29,24 +13,22 @@ before_deploy:
   - electron-builder --win --x64
   - mv ../build/TheDesk-setup.exe ../TheDesk-setup.exe
   - mv ../build/TheDesk*.exe ../TheDesk.exe
-  - electron-builder --linux --x64
-  - mv ../build/thedesk*.snap ../TheDesk.snap
-  - electron-builder --mac --x64
-  - mv ../build/TheDesk*.dmg ../TheDesk.dmg
   - cd ../
+  - ls
+after_deploy: ls
 deploy:
+  skip_cleanup: true
   provider: releases
-  # GitHub にリリースするための API KEY を暗号化した値
   api_key:
     secure: jndR02p5KRTtcJk18b3YsXL2cC+yzEf1AOqXdpWciF8f3lO5oY01jlxd17xdHIcK7VywSsLVZpLToSdqAoIEhJ5OxEQ/FmA3FlmbwwD6ou13gLa4VGIvsBHveCmKGjVu0Z++atIy76tZYU1SOWFWv4B0ZhnVz2ca2VZynvLgw3YNsPJH7rHO966GXgRkGYJAJ4UvLg3sj/iztVh2FSfbUj5IGO1e/JHJO63wAo1MSQtRjkutVgl/djnBLC6vbL4YHkM3Ynpkx/YQEcxwrmeY0Ra8D5yYDq4MNIDMmZahWC+k4u2eA2Cj2ifBFNxbZvTN75vLwRBp6DsTNHsiqkXrSPDBdNeet31RbwTQ6LtsK8jqmL4S/59dmLcj7uCU2WxyBLPbJdbdZWlqW2ZQvfQY8QVAYy7S3MiHQWQN0oP5wqXk89jcgR42ig/zsqFNPpXHM4mExR7l/gDLPg0j9c3XEF6sWtk3FmJN1i4+B+9kn09b6UKlV7EFPKp8XcFNrz4ZcE9/I8lKwsqLVG2jAXIk7Z9LwDRcAmK5eG348X5zwFtOY6raKIvRw2cn92bPnEI+55v8A4WANS2647GFTgxHj30D0d/sOZmJ5BS34zpdWTgE0AlKg7sOqkncjqoW5J5zCh5Ow7b3KXvEvlAts44mAag8tZTectxMP4iguXvTnv4=
-  # Releases ページにアップロードするファイル
-  file:
+  file: 
     - TheDesk.exe
     - TheDesk-setup.exe
     - TheDesk-ia32.exe
     - TheDesk-setup-ia32.exe
-    - TheDesk.snap
-    - TheDesk.dmg
-  skip_cleanup: true
   on:
-    repo: cutls/TheDesk
+    repo: cutls/TheDesk
+branches:
+  only:
+  - master
+