TheDesk Mio (15.6.0)

2018-06-12 00:44:28 +09:00 · 2018-06-12 00:44:28 +09:00 · cc95b26cdb
commit cc95b26cdb
parent f4ec593e26
75 changed files with 779 additions and 3871 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,2 +1,3 @@
 {
+    "git.ignoreLimitWarning": true
 }
--- a/LATEST.md
+++ b/LATEST.md
@ -1,15 +1,12 @@
 ## For Astarte(kirishima.cloud), My Primary Instance

-TheDesk :thedesk: Mio (ver.3)  
-・macOS版正式リリース
-・Spotifyなうぷれ改修(アートワーク投稿)
-・iTunesなうぷれ機能(macOS必須)
-・メインアカウント機能(起動時や投稿後のアカウントを指定)
-・エアリプソース確認が投稿者のアカウントのLTLに
-・未認証TLのトゥートをメインアカウントで詳細表示できるように
-・Nano機能がウィンドウ位置を記憶するように
-・DMタイムラインを実装
-・(imastodon.net)トレンドタグ表示機能
+TheDesk :thedesk: Mio (ver.6)  
+・ウィンドウの最大化を記憶するように
+・v2.4.0/1対応(bot表示/v2-search/rc時のトレンドタグ)
+・NanoウィンドウのUI改善
+・キーボードショートカット追加(Ctrl+Shift+1/2/3で特定文字を入力)
+・Spotifyのアートワーク投稿を任意に
+・さまざまなバグを修正
 ほか
 https://thedesk.top
 :github: https://github.com/cutls/TheDesk #Desk #DeskUpdate
@ -17,12 +14,10 @@ https://thedesk.top
 ## For Other Instances

 PCクライアントTheDesk Mio (ver.3)  
-・Spotifyなうぷれ改修(アートワーク投稿)
-・iTunesなうぷれ機能(macOS必須)
-・メインアカウント機能(起動時や投稿後のアカウントを指定)
-・エアリプソース確認が投稿者のアカウントのLTLに
-・未認証TLのトゥートをメインアカウントで詳細表示できるように
-・Nano機能がウィンドウ位置を記憶するように
-・DMタイムラインを実装
-・(imastodon.net)トレンドタグ表示機能
+・ウィンドウの最大化を記憶するように
+・v2.4.0/1対応(bot表示/v2-search/rc時のトレンドタグ)
+・NanoウィンドウのUI改善
+・キーボードショートカット追加(Ctrl+Shift+1/2/3で特定文字を入力)
+・Spotifyのアートワーク投稿を任意に
+・さまざまなバグを修正
 https://thedesk.top
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
 # TheDesk
-Mastodon client for Windows/Linux(Linux ver. is not supported by developer.)  
+Mastodon client for PC(Windows/Linux/macOS)  
 オープンソースSNSマストドンのWindows/Linuxクライアント  
 Download:[TheDesk](https://thedesk.top)  
 Latest Info(Markdown Toot)/最新情報(マークダウン形式のトゥート): [LATEST.md](https://github.com/cutls/TheDesk/blob/master/LATEST.md)
--- a/app/css/master.css
+++ b/app/css/master.css
@ -163,7 +163,9 @@ blockquote:before, .quote:before {
 .big-text{
  font-size:1.2rem;
 }
-
+#releasenote li{
+  list-style-type: disc
+}
@media only screen and (min-width: 993px){
 #toast-container {
    top:auto;
--- a/app/css/tl.css
+++ b/app/css/tl.css
@ -24,6 +24,7 @@
  flex-wrap:wrap;
  align-content:flex-start;
  overflow-y:scroll;
+  overflow-x:hidden;
 }
 #sidebar-btm{
  height:9em;
--- a/app/css/userdata.css
+++ b/app/css/userdata.css
@ -28,7 +28,7 @@
  height: calc(100% - 240px)
 }
 .my-data-width {
-  width: 11.11%;
+  width: 10%;
 }
 .active-back{
  background-color: #e6ee9c;
--- a/app/img/sticker.png
+++ b/app/img/sticker.png
--- a/app/index.html
+++ b/app/index.html
@ -24,8 +24,7 @@
 <script type="text/javascript" src="./js/common/modal.js"></script>
 <script type="text/javascript" src="./js/ui/jquery-ui.min.js"></script>
 <script>
-	//必ずアプデ時のremove instance消して！
-var ver="Mio (ver.5)";
+var ver="Mio (15.6.0)";
 //betaを入れるとバージョンチェックしない
 //var ver="beta";
 var acct_id=0;
@ -53,8 +52,10 @@ var tlid=0;
 <div id="auth">
 <select id="type-sel" style="color:black">
 	<option value="local" data-trans="local">ローカル</option>
+	<option value="local-media" data-trans="local-media">ローカル(メディア)</option>
 	<option value="home" data-trans="home">ホーム</option>
 	<option value="pub" data-trans="public">連合</option>
+	<option value="pub-media" data-trans="public-media">連合(メディア)</option>
 	<option value="dm" data-trans="dm">ダイレクトメッセージ</option>
 	<option value="mix" data-trans="integrated">統合(ローカルとホーム)</option>
 	<option value="plus" data-trans="plus">統合(ローカルとブースト・リプライ)</option>
@ -84,7 +85,7 @@ var tlid=0;
 <br><span data-trans="src_acct_sel">検索に使用するアカウントを選択</span>
 <br>
 <div class="input-field">
-<select id="src-acct-sel" class="acct-sel"></select>
+<select id="src-acct-sel" class="acct-sel" onchange="trend()"></select>
 <label></label>
 </div>
 <label for="src" data-trans="src">検索</label>
@ -151,7 +152,7 @@ var tlid=0;
 </div>
 <div class="big-menu" id="sort-tgl">
 <a onclick="sortToggle()" class="nex waves-effect">
-	<i class="material-icons nex big-icon" title="カラム一覧" data-trans-title="sort">sort</i>
+	<i class="material-icons nex big-icon" title="カラム一覧/並べ替え" data-trans-title="sort">sort</i>
 </a>
 <br>
 <span class="side-label" data-trans="sort">カラム一覧</span>
@ -201,7 +202,7 @@ var tlid=0;
 		<i class="material-icons" title="サイドバーの開閉" data-trans-title="sidebar_xpand" id="x-btn">keyboard_arrow_right</i>
 		<span class="side-label" data-trans="sidebar_xpand_short">たたむ</span>
 	</a>
-	</div>
+</div>
 </div>
 <div id="sidebar-btm">
 <!--最小化-->
@ -483,7 +484,7 @@ var tlid=0;
 	<div id="his-data-show">
 	<img src="./img/loading.svg" id="his-prof" style="">
 	<div class="his-float">
-	<span id="his-name" style="font-size:1.5rem">Loading...</span>
+	<span id="his-name" style="font-size:1.5rem">Loading...</span><span class="gray" id="his-bot"></span>
 	<br>@
 	<span id="his-acct"></span>
 	<span class="gray" id="his-relation"></span>
@ -507,7 +508,7 @@ var tlid=0;
 	<div class="row">
 	<div class="col s12" id="my-data-nav">
 	<ul class="custom-tabs transparent">
-		<li class="custom-tab col my-data-width active-back">
+		<li class="custom-tab col my-data-width active-back column-first">
 			<a go="#his-tl">タイムライン</a>
 		</li>
 		<li class="custom-tab col my-data-width">
@ -540,6 +541,9 @@ var tlid=0;
 		<li class="custom-tab col my-data-width only-my-data">
 			<a go="#his-request-list">フォローリクエスト</a>
 		</li>
+		<li class="custom-tab col my-data-width">
+			<a go="#his-matching-list">似てる</a>
+		</li>
 	</ul>
 	</div>
 	<div id="his-tl" class="col s12 tab-content">
@ -565,7 +569,7 @@ var tlid=0;
 		<a href="#!" class="waves-effect btn" onclick="udgEx('selector', 'selector')">プロフを開く</a><br>
 	</div>
 	<div id="his-list" class="col s12  tab-content">
-		<div id="his-lists-a"></div>
+		<div id="his-lists-a">リストに追加するためにはフォローが必要です。</div>
 		
 		<div id="his-lists-b"></div>
 	</div>
@ -595,15 +599,13 @@ var tlid=0;
 	</div>
 	<div id="his-prof-list" class="col s12  tab-content">名前
 	<br>
-	<input type="text" placeholder="名前" id="his-name-val" width="max-width:150px;">
+	<input type="text" placeholder="名前" id="his-name-val" style="max-width:250px;">
 	<br>自己紹介
 	<br>
 	<div class="input-field col s12">
 	<textarea placeholder="自己紹介" id="his-des-val" class="materialize-textarea"></textarea>
 	<label for="his-des-val">自己紹介</label>
 	</div>
-	<button onclick="profedit()" class="btn waves-effect indigo">適用</button>
-	<br>
 	<br>プロフィール画像変更:
 	<span id="prof-change">
 		<input type="file" onchange="imgChange(this,'avatar')">
@ -618,6 +620,14 @@ var tlid=0;
 	</div>
 	<button class="btn waves-effect " style="width:100%; padding:0;" onclick="showReq('more')">もっと</button>
 	</div>
+	<div id="his-matching-list" class="col s12  tab-content">
+		似ているユーザーを取得できます。<br>
+		Powered by <a href="https://vinayaka.distsn.org/" target="_blank">Mastodon User Matching</a><br>
+		<div id="his-matching-list-contents" class="cont-series">
+				
+		</div>
+		<button class="btn waves-effect " onclick="showMat()">取得</button>
+	</div>
 	</div>
 	</div>
 	</div>
@ -677,31 +687,48 @@ var tlid=0;
 		<h3>TheDesk</h3>
 		<a href="https://thedesk.top" target="_blank">HP</a><br>
 		<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br><br>
-			<div id="release-Mio_ver-5" style="display:none">
-				<h5>Release Note Mio (ver.5)</h5>
-・絵文字がいい感じに(Twemoji採用)<br>
-・打てる絵文字が拡充<br>
-・iTunesなうぷれのタグ追加<br>
-・ダウンローダーに関する不具合を修正<br>
+			<div id="release-Mio_15-6-0" style="display:none">
+				<h5>Release Note Mio (ver.6)</h5>
+<ul>
+	<li>ウィンドウの最大化を記憶するように</li>
+	<li>v2.4.0/1対応(bot表示/v2-search/rc時のトレンドタグ)</li>
+	<li>NanoウィンドウのUI改善</li>
+	<li>キーボードショートカット追加(Ctrl+Shift+1/2/3で特定文字を入力)</li>
+	<li>Spotifyのアートワーク投稿を任意に</li>
+	<li>さまざまなバグを修正</li>
+	以下ver.5の新機能<br>
+	<li>絵文字がいい感じに(Twemoji採用)</li>
+	<li>打てる絵文字が拡充</li>
+	<li>iTunesなうぷれのタグ追加</li>
+	<li>ダウンローダーに関する不具合を修正</li>
+</ul>			
 以下ver.4の新機能<br>
-・セキュリティアップデート<br>
-・UI変更<br>
-・macOSで通知が表示されるように<br>
+<ul>
+	<li>セキュリティアップデート</li>
+	<li>UI変更</li>
+	<li>macOSで通知が表示されるように</li>
+</ul>
 以下はver.3の新機能<br>
-・macOS版正式リリース<br>
-・Spotifyなうぷれ改修(アートワーク投稿)<br>
-・iTunesなうぷれ機能(macOS必須/Thanks to rinsuki)<br>
-・メインアカウント機能(起動時や投稿後のアカウントを指定)<br>
-・エアリプソース確認が投稿者のアカウントのLTLに<br>
-・未認証TLのトゥートをメインアカウントで詳細表示できるように<br>
-・Nano機能がウィンドウ位置を記憶するように<br>
-・DMタイムライン<br>
-・(imastodon.net)トレンドタグ表示機能<br>
+<ul><li>macOS版正式リリース</li>
+	<li>Spotifyなうぷれ改修(アートワーク投稿)</li>
+	<li>iTunesなうぷれ機能(macOS必須/Thanks to rinsuki)</li>
+	<li>メインアカウント機能(起動時や投稿後のアカウントを指定)</li>
+	<li>エアリプソース確認が投稿者のアカウントのLTLに</li>
+	<li>未認証TLのトゥートをメインアカウントで詳細表示できるように</li>
+	<li>Nano機能がウィンドウ位置を記憶するように</li>
+	<li>DMタイムライン</li>
+	<li>(imastodon.net)トレンドタグ表示機能</li>
+</ul>
 			</div>
 			<br><br>
 		TheDeskはオープンソース・ソフトウェアです。<br>
 		皆様のあたたかい支援のもとで製作されています。<br>
+		<h5>TheDesk自己主張ステッカー(5cm四方・透明)</h5>
+		<img src="./img/sticker.png" width="100">
+		<a href="https://cutls.booth.pm" target="_blank">購入</a><br>
+		<h5>その他</h5>
 		<a href="https://enty.jp/Cutls" target="_blank">Entyで支援</a><br>
+		<a href="https://www.amazon.co.jp/registry/wishlist/2TV35ZHHJPDSB" target="_blank">Amazonほしいものリスト</a><br>
 		<a href="mailto:mstdn@thedesk.top" target="_blank">mstdn@thedesk.top</a>にAmazonギフトカードを送る<br>
 		<a href="https://osushi.love/Cutls_P" target="_blank">Osushi.love</a>で寿司を贈る<br>
 		</div>
--- a/app/js/common/keyshortcut.js
+++ b/app/js/common/keyshortcut.js
@ -141,6 +141,14 @@ $(function($) {
 					tagsel('s');
 					return false;
 				}
+				//C+S+(No):ワンクリ
+				if (event.ctrlKey && event.shiftKey) {
+					if (e.keyCode >= 49 && e.keyCode <= 51) {
+						var no=e.keyCode-48;
+						if(localStorage.getItem("oks-"+no)){$("#textarea").val(localStorage.getItem("oks-"+no))}
+						return false;
+					}
+				}
 			}
 		}
 		//イメージビューワー切り替え
--- a/app/js/common/version.js
+++ b/app/js/common/version.js
@ -7,10 +7,12 @@ function verck(ver) {
 			$('#releasenote').modal('open');
 			verp=ver.replace( '(', '');
 			verp=verp.replace( '.', '-');
+			verp=verp.replace( '.', '-');
 			verp=verp.replace( '[', '-');
 			verp=verp.replace( ']', '');
 			verp=verp.replace( ')', '');
 			verp=verp.replace( ' ', '_');
+			console.log(verp);
 			$("#release-"+verp).show();
 		  });
 	}
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@ -21,8 +21,16 @@
 			ats = url.match(
 				/https:\/\/([-a-zA-Z0-9@.]+)\/@([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
 			);
-		console.log(ats);
+		console.log(toot);
 		if(toot){
+			ques = url.match(/https:\/\/quesdon\.rinsuki\.net\//);
+			console.log(ques);
+			if(ques){
+				if(ques[1]){
+					console.log("quesdon");
+					toot=[];
+				}
+			}
 			if(toot[1]){
 				var acct_id=$a.parent().attr("data-acct");
 				if(!acct_id){
@ -39,7 +47,17 @@
 			}
 		}else if(ats){
 			if(ats[2]){
-				return false;
+				if(ats[1]!="quesdon.rinsuki.net"){
+					return false
+				}else{
+					const {
+						shell
+					} = require('electron');
+		  
+					shell.openExternal(url);
+				}
+				
+				
 			}
 		}else{
 		//hrefがhttp/httpsならブラウザで
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@ -122,12 +122,13 @@ function follow(acct_id,remote) {
 		var start = "https://" + domain + "/api/v1/accounts/" + id + "/" + flag;
 		var ent={}
 	}
+	console.log(ent);
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
 	httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
 	httpreq.responseType = 'json';
-	httpreq.send();
+	httpreq.send(JSON.stringify(ent));
    httpreq.onreadystatechange = function() {
 		if (httpreq.readyState == 4) {
 			var json = httpreq.response;
--- a/app/js/tl/src.js
+++ b/app/js/tl/src.js
@ -3,6 +3,9 @@
 function srcToggle() {
 	$("#src-box").toggleClass("hide");
 	$("#src-box").toggleClass("show");
+	if($("#src-box").hasClass("show")){
+		trend();
+	}
 	$("#src-box").css("top",$('#src-tgl').offset().top-$("#src-box").height()/2+"px");
 	$("#src-box").css("left",$('#src-tgl').offset().left-410+"px");
 	$('ul.tabs').tabs('select_tab', 'src-sta');
@ -10,7 +13,8 @@ function srcToggle() {
 }

 //検索取得
-function src() {
+function src(mode) {
+	$("#src-contents").html("");
 	var q = $("#src").val();
 	var acct_id = $("#src-acct-sel").val();
 	if(acct_id=="tootsearch"){
@ -23,7 +27,11 @@ function src() {
 	if (user == "--now") {
 		var user = $('#his-data').attr("user-id");
 	}
-	var start = "https://" + domain + "/api/v1/search?q=" + q
+	if(!mode){
+		var start = "https://" + domain + "/api/v2/search?q=" + q
+	}else{
+		var start = "https://" + domain + "/api/v1/search?q=" + q
+	}
 	console.log(start)
 	fetch(start, {
 		method: 'GET',
@ -34,9 +42,25 @@ function src() {
 	}).then(function(response) {
 		return response.json();
 	}).catch(function(error) {
-		todo(error);
-		console.error(error);
+		src("v1")
+		return false;
 	}).then(function(json) {
+		console.log(json);
+		//ハッシュタグ
+		if (json.hashtags[0]) {
+			var tags = "";
+			Object.keys(json.hashtags).forEach(function(key4) {
+				var tag = json.hashtags[key4];
+				if(mode){
+					tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
+					'\',\'add\')" class="pointer">#' + tag + '</a><br> ';
+				}else{
+					tags=tags+graphDraw(tag);
+				}
+				
+			});
+			$("#src-contents").append("Tags<br>" + tags);
+		}
 		//トゥート
 		if (json.statuses[0]) {
 			var templete = parse(json.statuses,'',acct_id);
@ -47,16 +71,6 @@ function src() {
 			var templete = userparse(json.accounts,'',acct_id);
 			$("#src-contents").append("Accounts<br>" + templete);
 		}
-		//ハッシュタグ
-		if (json.hashtags[0]) {
-			var tags = "";
-			Object.keys(json.hashtags).forEach(function(key4) {
-				var tag = json.hashtags[key4];
-				tags = tags + '<a onclick="tl(\'tag\',\'' + tag + '\',\'' + acct_id +
-					'\',\'add\')" class="pointer">#' + tag + '</a><br> ';
-			});
-			$("#src-contents").append("Tags<br>" + tags);
-		}
 		jQuery("time.timeago").timeago();
 	});
 }
@ -81,7 +95,7 @@ function tootsearch(q){
 				var toot = json[key5]["_source"];
 				console.log(toot);
 				if(toot && toot.account){
-					templete = templete+parse([toot],'');
+					templete = templete+parse([toot],'noauth');
 				}
 			});
 			if(!templete){
@ -90,4 +104,81 @@ function tootsearch(q){
 			$("#src-contents").html("Tootsearch(時系列)<br>" + templete);
 		jQuery("time.timeago").timeago();
 	});
-}
+}
+function trend(){
+	$("#src-contents").html("");
+	var acct_id = $("#src-acct-sel").val();
+	if(acct_id=="tootsearch"){
+		return false;
+	}
+	var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem(domain + "_at");
+	if (user == "--now") {
+		var user = $('#his-data').attr("user-id");
+	}
+	var start = "https://" + domain + "/api/v1/trends"
+	console.log(start)
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json',
+			'Authorization': 'Bearer ' + at
+		},
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(json) {
+		var tags = "";
+			Object.keys(json).forEach(function(keye) {
+				var tag = json[keye];
+				var his=tag.history;
+				var max=Math.max.apply(null, [his[0].uses,his[1].uses,his[2].uses,his[3].uses,his[4].uses,his[5].uses,his[6].uses]);
+				var six=50-(his[6].uses/max*50);
+				var five=50-(his[5].uses/max*50);
+				var four=50-(his[4].uses/max*50);
+				var three=50-(his[3].uses/max*50);
+				var two=50-(his[2].uses/max*50);
+				var one=50-(his[1].uses/max*50);
+				var zero=50-(his[0].uses/max*50);
+				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+"人がトゥート";
+					
+					$("#src-contents").append(tags);
+			});
+			
+	});
+}
+function graphDraw(tag){
+	var tags="";
+		var his=tag.history;
+		console.log(his);
+		var max=Math.max.apply(null, [his[0].uses,his[1].uses,his[2].uses,his[3].uses,his[4].uses,his[5].uses,his[6].uses]);
+		var six=50-(his[6].uses/max*50);
+		var five=50-(his[5].uses/max*50);
+		var four=50-(his[4].uses/max*50);
+		var three=50-(his[3].uses/max*50);
+		var two=50-(his[2].uses/max*50);
+		var one=50-(his[1].uses/max*50);
+		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+"人がトゥート";
+		}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+"人がトゥート";
+		}
+		
+	return tags;
+}
+/*
+<svg version="1.1" viewbox="0 0 50 300" width="100%" height="50">
+	<path d="M0,0 L10,0 20,10 20,50" fill="#3F51B5"></path>
+</svg>
+*/
--- a/app/js/tl/tag.js
+++ b/app/js/tl/tag.js
@ -66,7 +66,7 @@ function favTag(){
    }
 }
 function trendTag(){
-    $("#trendtag").html("");
+    $(".trendtag").remove();
    var domain="imastodon.net"
    var at = localStorage.getItem(domain + "_at");
    var start = "https://" + domain + "/api/v1/trend_tags"
@ -89,7 +89,7 @@ function trendTag(){
            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="brInsert(\'#' + tag + '\')" class="pointer" title="#' + tag + 'でトゥート">Toot</a></span> ';
             });
-             $("#taglist").append('<span id="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags+'</span>');
+             $("#taglist").append('<span class="trendtag">トレンドタグ<i class="material-icons pointer" onclick="trendTag()" style="font-size:12px">refresh</i>:' + tags+'</span>');
             trendintervalset()
        }else{
            $("#taglist").html("");
@ -101,7 +101,6 @@ function trendTag(){
 function trendintervalset(){
    setTimeout(trendTag, 6000000);

-
 }
 function tagTL(a,b,c,d){
    var acct_id = $("#post-acct-sel").val();
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@ -113,9 +113,15 @@ function reload(type, cc, acct_id, tlid, data) {
 	} else if (type == "pub") {
 		var start = "wss://" + domain +
 			"/api/v1/streaming/?stream=public&access_token=" + at;
+	} else if (type == "pub-media") {
+		var start = "wss://" + domain +
+			"/api/v1/streaming/?stream=public:media&access_token=" + at;
 	} else if (type == "local") {
 		var start = "wss://" + domain +
 			"/api/v1/streaming/?stream=public:local&access_token=" + at;
+	} else if (type == "local-media") {
+		var start = "wss://" + domain +
+			"/api/v1/streaming/?stream=public:local:media&only_media=true&access_token=" + at;
 	} else if (type == "tag") {
 		if(type=="tag"){
 			var tag = localStorage.getItem("tag-range");
@ -305,12 +311,24 @@ function cap(type, data, acct_id) {
 		}else{
 			var response="Local TL";
 		}
+	} else if (type == "local-media") {
+		if(localStorage.getItem("local_" + acct_id) && !locale){
+			var response=localStorage.getItem("local_" + acct_id)+"(メディア)";
+		}else{
+			var response="Local TL(Media)";
+		}
 	} else if (type == "pub") {
 		if(localStorage.getItem("public_" + acct_id) && !locale){
 			var response=localStorage.getItem("public_" + acct_id);
 		}else{
 			var response="Federated TL";
 		}
+	} else if (type == "pub-media") {
+		if(localStorage.getItem("public_" + acct_id) && !locale){
+			var response=localStorage.getItem("public_" + acct_id)+"(メディア)";
+		}else{
+			var response="Federated TL(Media)";
+		}
 	} else if (type == "tag") {
 		var response= "#" + data
 	} else if (type == "list") {
@ -336,8 +354,12 @@ function com(type, data) {
 		return "home?"
 	} else if (type == "local" || type == "noauth") {
 		return "public?local=true&"
+	} else if (type == "local-media") {
+		return "public?local=true&only_media=true&"
 	} else if (type == "pub") {
 		return "public?"
+	} else if (type == "pub-media") {
+		return "public?only_media=true&"
 	} else if (type == "tag") {
 		return "tag/" + data + "?"
 	}else if (type == "list") {
@ -351,9 +373,9 @@ function com(type, data) {
 function icon(type) {
 	if (type == "home") {
 		return "home"
-	} else if (type == "local" || type == "noauth") {
+	} else if (type == "local" || type == "noauth" || type == "local-media") {
 		return "people_outline"
-	} else if (type == "pub") {
+	} else if (type == "pub" || type == "pub-media") {
 		return "language"
 	} else if (type == "tag") {
 		return "search"
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@ -54,8 +54,8 @@ function xpand() {
 		$("#x-btn").text("keyboard_arrow_right");
 		localStorage.removeItem("xed");
 	} else {
-		$("#sidebar").css('width', '24px');
-		$("#sidebar").css('min-width', '24px');
+		$("#sidebar").css('width', '29px');
+		$("#sidebar").css('min-width', '29px');
 		$("#post-box").css('right', '27px');
 		$("#sidebar").addClass("xed");
 		$("#sidebar .big-menu i").removeClass('big-icon');
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@ -293,6 +293,7 @@ climute();
 wordmute();
 wordemp();
 checkSpotify();
+oksload();
 function climute(){
 	//クライアントミュート
 	var cli = localStorage.getItem("client_mute");
@ -364,4 +365,14 @@ function notftest(){
 			ipc.send('native-notf', ['TheDesk通知テスト','通知テスト(画像はあなたのアカウントのアイコンです)',localStorage.getItem('prof_0')]);
 		}
 	
+}
+function oks(no){
+	var txt=$("#oks-"+no).val();
+	localStorage.setItem("oks-"+no, txt);
+	Materialize.toast("キーボードショートカットを更新しました。", 3000);
+}
+function oksload(){
+	if(localStorage.getItem("oks-1")){$("#oks-1").val(localStorage.getItem("oks-1"))}
+	if(localStorage.getItem("oks-2")){$("#oks-2").val(localStorage.getItem("oks-2"))}
+	if(localStorage.getItem("oks-3")){$("#oks-3").val(localStorage.getItem("oks-3"))}
 }
--- a/app/js/ui/spotify.js
+++ b/app/js/ui/spotify.js
@ -46,6 +46,22 @@ function checkSpotify(){
        var content="#NowPlaying {song} / {album} / {artist}\n{url} #SpotifyWithTheDesk";
    }
    $("#np-temp").val(content);
+    var flag=localStorage.getItem("artwork");
+    if(flag){
+        $("#awk_yes").prop("checked", true);
+    }else{
+        $("#awk_no").prop("checked", true);
+    }
+}
+function spotifyFlagSave(){
+    var awk = $("[name=awk]:checked").val();
+    if(awk=="yes"){
+        localStorage.setItem("artwork","yes");
+        Materialize.toast("アルバムアートワークを添付します。", 3000);
+    }else{
+        localStorage.removeItem("artwork");
+        Materialize.toast("アルバムアートワークを添付しません。", 3000);
+    }
 }
 function nowplaying(mode){
    if(mode=="spotify"){
@ -68,7 +84,10 @@ function nowplaying(mode){
            var img=item.album.images[0].url;
            var electron = require("electron");
             var ipc = electron.ipcRenderer;
-            ipc.send('bmp-image', [img,0]);
+             var flag=localStorage.getItem("artwork");
+            if(flag){
+                ipc.send('bmp-image', [img,0]);
+            }
            var content=localStorage.getItem("np-temp");
            if(!content || content==""){
                var content="#NowPlaying {song} / {album} / {artist}\n{url}";
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@ -370,3 +370,45 @@ function showDom(more, acct_id) {
 	});
 }

+//ユーザーマッチングリスト
+function showMat() {
+	$("#his-matching-list-contents").html("30秒から数分かかります");
+	var full=$("#his-acct").attr("fullname");
+	var acct_id=$("#his-data").attr("use-acct");
+	full=full.split("@");
+	var start = "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-api.cgi?"+full[1]+"+" + full[0];
+	console.log(start);
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'content-type': 'application/json'
+		},
+		//body: JSON.stringify({})
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(json) {
+		console.log(json);
+		var templete="";
+		Object.keys(json).forEach(function(key) {
+			var user = json[key];
+			templete = templete +
+			'<div class="" style="padding-top:5px;">' +
+			'<div style="padding:0; margin:0; width:400px; max-width:100%; display:flex; align-items:flex-end;">' +
+			'<div style="flex-basis:40px;"><a onclick="udgEx(\'' + user.user + '\',' +
+			acct_id + ');" user="' + user.user + '" class="udg">' +
+			'<img src="' + user.avatar + '" width="40" class="prof-img" user="' + user.user + '"></a></div>' +
+			'<div style="flex-grow:3; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"><big>' +
+			escapeHTML(user.screen_name) + '</big></div>' +
+			'<div class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"> @' +
+			user.user + '@'+user.host+'</div>' +
+			'</div>' + 
+			'<div class="divider"></div>' +
+			'</div>' +
+			'</div>';
+		});
+		$("#his-matching-list-contents").html(templete);
+	});
+}
--- a/app/js/userdata/prof-edit.js
+++ b/app/js/userdata/prof-edit.js
@ -15,7 +15,7 @@ function profedit() {
 	httpreq.responseType = 'json';
 	httpreq.send(JSON.stringify({
 		display_name: name,
-		note: des
+		note: des,
 	}));
    httpreq.onreadystatechange = function() {
 		if (httpreq.readyState == 4) {
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@ -63,6 +63,7 @@ function udg(user, acct_id) {
 		todo(error);
 		console.error(error);
 	}).then(function(json) {
+		console.log(json);
 		//一つ前のユーザーデータ
 		if (!localStorage.getItem("history")){
 			$("#his-history-btn").prop("disabled",true);
@ -134,6 +135,9 @@ function udg(user, acct_id) {
 			}else{
 				$("#his-des").html(json.note);
 			}
+			if(json.bot){
+				$("#his-bot").html("botアカウント");
+			}
 			$('#his-data').css('background-size', 'cover');
 			localStorage.setItem("history" , user);
 			//自分の時
@ -144,6 +148,10 @@ function udg(user, acct_id) {
 				showDom('', acct_id);
 				showReq('', acct_id);
 				$("#his-name-val").val(json.display_name);
+				$("#his-f1-name").val(json.fields[0].name); $("#his-f1-val").val($.strip_tags(json.fields[0].value));
+				$("#his-f2-name").val(json.fields[1].name); $("#his-f2-val").val($.strip_tags(json.fields[1].value));
+				$("#his-f3-name").val(json.fields[2].name); $("#his-f3-val").val($.strip_tags(json.fields[2].value));
+				$("#his-f4-name").val(json.fields[3].name); $("#his-f4-val").val($.strip_tags(json.fields[3].value));
 				var des = json.note;
 				des = des.replace(/<br \/>/g, "\n")
 				des = $.strip_tags(des);
@ -158,7 +166,6 @@ function udg(user, acct_id) {
 				$(".only-his-data").hide();
 			} else {
 				relations(user, acct_id);
-				hisList(user,acct_id);
 				$(".only-my-data").hide();
 				$(".only-his-data").show();
 			}
@ -203,6 +210,7 @@ function relations(user, acct_id) {
 			//自分がフォローしている
 			$("#his-data").addClass("following");
 			$("#his-follow-btn").text("フォロー解除");
+			hisList(user,acct_id);
 		}else{
 			$("#his-follow-btn").text("フォロー");
 		}
@ -248,6 +256,8 @@ function hisclose() {
 function reset(){
 	$(".tab-content:eq(0)").show();
 	$(".tab-content:gt(0)").hide();
+	$(".active-back").removeClass("active-back");
+	$(".column-first").addClass("active-back");
 	$("#his-name").text("Loading");
 	$("#his-acct").text("");
 	$("#his-prof").attr("src", "./img/loading.svg");
@ -263,6 +273,7 @@ function reset(){
 	$("#his-data").removeClass("blocking");
 	$("#his-data").removeClass("mutingNotf");
 	$("#his-data").removeClass("blockingDom");
+	$("#his-bot").html("");
 	$("#his-follow-btn").show();
 	$("#his-block-btn").show();
 	$("#his-mute-btn").show();
@ -277,6 +288,14 @@ function reset(){
 	$("#his-relation").text("");
 	$(".cont-series").html("");
 	$("#domainblock").val("");
+	$("#his-lists-a").html('リストに追加するためにはフォローが必要です。');
+	$("#his-lists-b").html('');
+	$("#his-name-val").val("");
+	$("#his-des-val").val("");
+	$("#his-f1-name").val(""); $("#his-f1-val").val("");
+	$("#his-f2-name").val(""); $("#his-f2-val").val("");
+	$("#his-f3-name").val(""); $("#his-f3-val").val("");
+	$("#his-f4-name").val(""); $("#his-f4-val").val("");
 }
 $('#my-data-nav .custom-tab').on('click',function(){
 	var target=$(this).find("a").attr("go");
--- a/app/main.js
+++ b/app/main.js
@ -12,16 +12,6 @@ const Menu=electron.Menu
 var updatewin=null;
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
-	var platform=process.platform;
-	var bit=process.arch;
-	if(platform=="win32"){
-	const WindowsToaster = require('node-notifier').WindowsToaster;
-	var notifier = new WindowsToaster({
-    	withFallback: false, // Fallback to Growl or Balloons? 
-    	customPath: void 0 // Relative path if you want to use your fork of toast.exe 
-	});
-	}
-
 // ウィンドウを作成するモジュール
 const BrowserWindow = electron.BrowserWindow;
 const {
@ -31,6 +21,7 @@ const join = require('path').join;
 // メインウィンドウはGCされないようにグローバル宣言
 let mainWindow;
 var info_path = join(app.getPath("userData"), "window-size.json");
+var max_info_path = join(app.getPath("userData"), "max-window-size.json");
 var tmp_img = join(app.getPath("userData"), "tmp.png");
 var window_size;
 try {
@ -41,6 +32,17 @@ try {
 		height: 750
 	}; // デフォルトバリュー
 }
+var max_window_size;
+try {
+	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'));
+} catch (e) {
+	max_window_size = {
+		width: "string",
+		height: "string",
+		x: "string",
+		y: "string"
+	}; // デフォルトバリュー
+}

 // 全てのウィンドウが閉じたら終了
 app.on('window-all-closed', function() {
@ -55,9 +57,9 @@ function createWindow() {
 	var platform=process.platform;
 	var bit=process.arch;
 	if(platform=="linux"){
-		var arg={width:window_size.width,height:window_size.height,icon: __dirname + '/thedesk.ico'}
+		var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,icon: __dirname + '/thedesk.ico'}
 	}else{
-		var arg=window_size
+		var arg={width:window_size.width,height:window_size.height,x:window_size.x,y:window_size.y,simpleFullscreen:true}
 	}
 	mainWindow = new BrowserWindow(arg);
 	electron.session.defaultSession.clearCache(() => {})
@ -79,12 +81,31 @@ function createWindow() {
 	}else{
 		mainWindow.loadURL('file://' + __dirname + '/index.html');
 	}
+	if(!window_size.x && !window_size.y){
+		mainWindow.center();
+	}
+	if(window_size.max){
+		mainWindow.maximize();
+	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function() {
 		mainWindow = null;
 	});
 	mainWindow.on('close', function() {
-		fs.writeFileSync(info_path, JSON.stringify(mainWindow.getBounds()));
+		if(
+			max_window_size.width==mainWindow.getBounds().width && 
+			max_window_size.height==mainWindow.getBounds().height &&
+			max_window_size.x==mainWindow.getBounds().x &&
+		  	max_window_size.y==mainWindow.getBounds().y
+		){
+			var size={width:mainWindow.getBounds().width,height:mainWindow.getBounds().height,x:mainWindow.getBounds().x,y:mainWindow.getBounds().y,max:true}
+		}else{
+			var size={width:mainWindow.getBounds().width,height:mainWindow.getBounds().height,x:mainWindow.getBounds().x,y:mainWindow.getBounds().y}
+		}
+		fs.writeFileSync(info_path, JSON.stringify(size));
+	});
+	mainWindow.on('maximize', function() {
+		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
 	});
 	  // Create the Application's main menu
 	  var template = [{
@ -128,9 +149,12 @@ var onError = function(err,response){

 var ipc = electron.ipcMain;
 ipc.on('native-notf', function(e, args) {
+	
 	var platform=process.platform;
 	var bit=process.arch;
 	if(platform=="win32"){
+		const notifier = require('node-notifier');
+	// String
 	Jimp.read(args[2], function (err, lenna) {
 		if(!err && lenna){
 			lenna.write(tmp_img);
@ -139,9 +163,12 @@ ipc.on('native-notf', function(e, args) {
 			var tmp_imge="";
 		}
 		notifier.notify({
-			body: args[1],
+			appName: "top.thedesk.thedesk",
+			message: args[1],
 			title: args[0],
 			icon : tmp_imge,
+			sound: false,
+			wait: false
 		});
 		
 	});
--- a/app/nano.html
+++ b/app/nano.html
@ -6,13 +6,27 @@
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 <title>TheDesk Nano</title>
 <style>
-body {
-    background-color: rgba(0, 0, 0, 0.1);
+html{
+	-webkit-app-region: drag !important;
+	 cursor: move !important;
+	 width:100vw;
+	 height:100vh;
+	 overflow:hidden;
+}
+body {
+	background-color: rgba(0, 0, 0, 0.1);
+	font-size:11px;
+}
+#timeline_nano{
+	overflow-y:scroll;
+	overflow-x:hidden;
+	-webkit-app-region: no-drag;
+	max-height:100px;
+}
+.user{font-size:12px;}
+select {
+  -webkit-app-region: no-drag;
 }
-#draghandle{
- -webkit-app-region: drag;
- cursor: move;
- }
 button {
  -webkit-app-region: no-drag;
 }
@ -56,21 +70,21 @@ textarea {
 <body>
        <script type="text/javascript" src="./js/common/jquery.js"></script>
        <script type="text/javascript" src="./js/platform/first.js"></script>
-<div id="draghandle">+ここを持って移動+</div>
-<span id="timeline_nano">
-            <select id="type-sel">
-                <option value="local">Local</option>
-                <option value="home">Home</option>
-            </select>
-            <button onclick="tl()">表示</button>
-</span><br><button onclick="window.close()">終了</button><br>
-<textarea id="textarea" style="width:100%; background-color:transparent"></textarea>
+<select id="post-acct-sel" style="max-width:150px">
+</select>
+<select id="type-sel" style="max-width:60px">
+	<option value="local">Local</option>
+	<option value="home">Home</option>
+</select><button onclick="tl()">表示</button><button onclick="window.close()">x</button><br>
+<div id="timeline_nano">
+	
+</div>
+<br>
+<textarea id="textarea" style="width:80%; background-color:transparent"></textarea>
 <input type="hidden" id="reply">
 <input type="hidden" id="media">
-<select id="post-acct-sel">
-
-    </select>
-<button class="btn" onclick="post()">投稿</button>
+	<button class="btn" onclick="post()">投稿</button>
+<script src="https://twemoji.maxcdn.com/2/twemoji.min.js?2.7"></script>
 <script type="text/javascript" src="./js/post/post.js"></script>
 <script type="text/javascript" src="./js/post/reply.js"></script>
 <script type="text/javascript" src="./js/tl/parse.js"></script>
--- a/app/node_modules/.bin/semver
+++ b/app/node_modules/.bin/semver
@ -1 +1,15 @@
-../semver/bin/semver
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../semver/bin/semver" "$@"
+  ret=$?
+else 
+  node  "$basedir/../semver/bin/semver" "$@"
+  ret=$?
+fi
+exit $ret
--- a/app/node_modules/.bin/which
+++ b/app/node_modules/.bin/which
@ -1 +1,15 @@
-../which/bin/which
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  "$basedir/node"  "$basedir/../which/bin/which" "$@"
+  ret=$?
+else 
+  node  "$basedir/../which/bin/which" "$@"
+  ret=$?
+fi
+exit $ret
--- a/app/node_modules/growly/package.json
+++ b/app/node_modules/growly/package.json
@ -1,32 +1,27 @@
 {
-  "_args": [
-    [
-      "growly@1.3.0",
-      "/Users/aa/TheDesk/app"
-    ]
-  ],
-  "_from": "growly@1.3.0",
+  "_from": "growly@^1.3.0",
  "_id": "growly@1.3.0",
  "_inBundle": false,
  "_integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
  "_location": "/growly",
  "_phantomChildren": {},
  "_requested": {
-    "type": "version",
+    "type": "range",
    "registry": true,
-    "raw": "growly@1.3.0",
+    "raw": "growly@^1.3.0",
    "name": "growly",
    "escapedName": "growly",
-    "rawSpec": "1.3.0",
+    "rawSpec": "^1.3.0",
    "saveSpec": null,
-    "fetchSpec": "1.3.0"
+    "fetchSpec": "^1.3.0"
  },
  "_requiredBy": [
    "/node-notifier"
  ],
  "_resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-  "_spec": "1.3.0",
-  "_where": "/Users/aa/TheDesk/app",
+  "_shasum": "f10748cbe76af964b7c96c93c6bcc28af120c081",
+  "_spec": "growly@^1.3.0",
+  "_where": "C:\\Users\\ryuki\\TheDesk\\app\\node_modules\\node-notifier",
  "author": {
    "name": "Ibrahim Al-Rajhi",
    "email": "abrahamalrajhi@gmail.com",
@ -35,6 +30,8 @@
  "bugs": {
    "url": "http://github.com/theabraham/growly/issues"
  },
+  "bundleDependencies": false,
+  "deprecated": false,
  "description": "Simple zero-dependency Growl notifications using GNTP.",
  "directories": {
    "example": "example",
--- a/app/node_modules/isexe/package.json
+++ b/app/node_modules/isexe/package.json
@ -1,32 +1,27 @@
 {
-  "_args": [
-    [
-      "isexe@2.0.0",
-      "/Users/aa/TheDesk/app"
-    ]
-  ],
-  "_from": "isexe@2.0.0",
+  "_from": "isexe@^2.0.0",
  "_id": "isexe@2.0.0",
  "_inBundle": false,
  "_integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
  "_location": "/isexe",
  "_phantomChildren": {},
  "_requested": {
-    "type": "version",
+    "type": "range",
    "registry": true,
-    "raw": "isexe@2.0.0",
+    "raw": "isexe@^2.0.0",
    "name": "isexe",
    "escapedName": "isexe",
-    "rawSpec": "2.0.0",
+    "rawSpec": "^2.0.0",
    "saveSpec": null,
-    "fetchSpec": "2.0.0"
+    "fetchSpec": "^2.0.0"
  },
  "_requiredBy": [
    "/which"
  ],
  "_resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-  "_spec": "2.0.0",
-  "_where": "/Users/aa/TheDesk/app",
+  "_shasum": "e8fbf374dc556ff8947a10dcb0572d633f2cfa10",
+  "_spec": "isexe@^2.0.0",
+  "_where": "C:\\Users\\ryuki\\TheDesk\\app\\node_modules\\which",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
@ -35,6 +30,8 @@
  "bugs": {
    "url": "https://github.com/isaacs/isexe/issues"
  },
+  "bundleDependencies": false,
+  "deprecated": false,
  "description": "Minimal module to check if a file is executable.",
  "devDependencies": {
    "mkdirp": "^0.5.1",
--- a/app/node_modules/node-notifier/package.json
+++ b/app/node_modules/node-notifier/package.json
@ -1,44 +1,41 @@
 {
-  "_args": [
-    [
-      "node-notifier@5.2.1",
-      "/Users/aa/TheDesk/app"
-    ]
-  ],
-  "_from": "node-notifier@5.2.1",
+  "_from": "node-notifier@^5.2.1",
  "_id": "node-notifier@5.2.1",
  "_inBundle": false,
  "_integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==",
  "_location": "/node-notifier",
  "_phantomChildren": {},
  "_requested": {
-    "type": "version",
+    "type": "range",
    "registry": true,
-    "raw": "node-notifier@5.2.1",
+    "raw": "node-notifier@^5.2.1",
    "name": "node-notifier",
    "escapedName": "node-notifier",
-    "rawSpec": "5.2.1",
+    "rawSpec": "^5.2.1",
    "saveSpec": null,
-    "fetchSpec": "5.2.1"
+    "fetchSpec": "^5.2.1"
  },
  "_requiredBy": [
    "/"
  ],
  "_resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz",
-  "_spec": "5.2.1",
-  "_where": "/Users/aa/TheDesk/app",
+  "_shasum": "fa313dd08f5517db0e2502e5758d664ac69f9dea",
+  "_spec": "node-notifier@^5.2.1",
+  "_where": "C:\\Users\\ryuki\\TheDesk\\app",
  "author": {
    "name": "Mikael Brevik"
  },
  "bugs": {
    "url": "https://github.com/mikaelbr/node-notifier/issues"
  },
+  "bundleDependencies": false,
  "dependencies": {
    "growly": "^1.3.0",
    "semver": "^5.4.1",
    "shellwords": "^0.1.1",
    "which": "^1.3.0"
  },
+  "deprecated": false,
  "description": "A Node.js module for sending notifications on native Mac, Windows (post and pre 8) and Linux (or Growl as fallback)",
  "devDependencies": {
    "eslint": "^4.15.0",
--- a/app/node_modules/semver/package.json
+++ b/app/node_modules/semver/package.json
@ -1,38 +1,35 @@
 {
-  "_args": [
-    [
-      "semver@5.5.0",
-      "/Users/aa/TheDesk/app"
-    ]
-  ],
-  "_from": "semver@5.5.0",
+  "_from": "semver@^5.4.1",
  "_id": "semver@5.5.0",
  "_inBundle": false,
  "_integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
  "_location": "/semver",
  "_phantomChildren": {},
  "_requested": {
-    "type": "version",
+    "type": "range",
    "registry": true,
-    "raw": "semver@5.5.0",
+    "raw": "semver@^5.4.1",
    "name": "semver",
    "escapedName": "semver",
-    "rawSpec": "5.5.0",
+    "rawSpec": "^5.4.1",
    "saveSpec": null,
-    "fetchSpec": "5.5.0"
+    "fetchSpec": "^5.4.1"
  },
  "_requiredBy": [
    "/node-notifier"
  ],
  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-  "_spec": "5.5.0",
-  "_where": "/Users/aa/TheDesk/app",
+  "_shasum": "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab",
+  "_spec": "semver@^5.4.1",
+  "_where": "C:\\Users\\ryuki\\TheDesk\\app\\node_modules\\node-notifier",
  "bin": {
    "semver": "./bin/semver"
  },
  "bugs": {
    "url": "https://github.com/npm/node-semver/issues"
  },
+  "bundleDependencies": false,
+  "deprecated": false,
  "description": "The semantic version parser used by npm.",
  "devDependencies": {
    "tap": "^10.7.0"
--- a/app/node_modules/shellwords/package.json
+++ b/app/node_modules/shellwords/package.json
@ -1,32 +1,27 @@
 {
-  "_args": [
-    [
-      "shellwords@0.1.1",
-      "/Users/aa/TheDesk/app"
-    ]
-  ],
-  "_from": "shellwords@0.1.1",
+  "_from": "shellwords@^0.1.1",
  "_id": "shellwords@0.1.1",
  "_inBundle": false,
  "_integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
  "_location": "/shellwords",
  "_phantomChildren": {},
  "_requested": {
-    "type": "version",
+    "type": "range",
    "registry": true,
-    "raw": "shellwords@0.1.1",
+    "raw": "shellwords@^0.1.1",
    "name": "shellwords",
    "escapedName": "shellwords",
-    "rawSpec": "0.1.1",
+    "rawSpec": "^0.1.1",
    "saveSpec": null,
-    "fetchSpec": "0.1.1"
+    "fetchSpec": "^0.1.1"
  },
  "_requiredBy": [
    "/node-notifier"
  ],
  "_resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-  "_spec": "0.1.1",
-  "_where": "/Users/aa/TheDesk/app",
+  "_shasum": "d6b9181c1a48d397324c84871efbcfc73fc0654b",
+  "_spec": "shellwords@^0.1.1",
+  "_where": "C:\\Users\\ryuki\\TheDesk\\app\\node_modules\\node-notifier",
  "author": {
    "name": "Jimmy Cuadra",
    "email": "jimmy@jimmycuadra.com",
@ -35,7 +30,9 @@
  "bugs": {
    "url": "https://github.com/jimmycuadra/shellwords/issues"
  },
+  "bundleDependencies": false,
  "dependencies": {},
+  "deprecated": false,
  "description": "Manipulate strings according to the word parsing rules of the UNIX Bourne shell.",
  "devDependencies": {
    "jasmine-node": "~1.0.26",
--- a/app/node_modules/which/CHANGELOG.md
+++ b/app/node_modules/which/CHANGELOG.md
@ -1,6 +1,11 @@
 # Changes


+## 1.3.1
+
+* update deps
+* update travis
+
 ## v1.3.0

 * Add nothrow option to which.sync
--- a/app/node_modules/which/package.json
+++ b/app/node_modules/which/package.json
@ -1,32 +1,27 @@
 {
-  "_args": [
-    [
-      "which@1.3.0",
-      "/Users/aa/TheDesk/app"
-    ]
-  ],
-  "_from": "which@1.3.0",
-  "_id": "which@1.3.0",
+  "_from": "which@^1.3.0",
+  "_id": "which@1.3.1",
  "_inBundle": false,
-  "_integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+  "_integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
  "_location": "/which",
  "_phantomChildren": {},
  "_requested": {
-    "type": "version",
+    "type": "range",
    "registry": true,
-    "raw": "which@1.3.0",
+    "raw": "which@^1.3.0",
    "name": "which",
    "escapedName": "which",
-    "rawSpec": "1.3.0",
+    "rawSpec": "^1.3.0",
    "saveSpec": null,
-    "fetchSpec": "1.3.0"
+    "fetchSpec": "^1.3.0"
  },
  "_requiredBy": [
    "/node-notifier"
  ],
-  "_resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-  "_spec": "1.3.0",
-  "_where": "/Users/aa/TheDesk/app",
+  "_resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+  "_shasum": "a45043d54f5805316da8d62f9f50918d3da70b0a",
+  "_spec": "which@^1.3.0",
+  "_where": "C:\\Users\\ryuki\\TheDesk\\app\\node_modules\\node-notifier",
  "author": {
    "name": "Isaac Z. Schlueter",
    "email": "i@izs.me",
@ -38,14 +33,16 @@
  "bugs": {
    "url": "https://github.com/isaacs/node-which/issues"
  },
+  "bundleDependencies": false,
  "dependencies": {
    "isexe": "^2.0.0"
  },
+  "deprecated": false,
  "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.",
  "devDependencies": {
    "mkdirp": "^0.5.0",
-    "rimraf": "^2.3.3",
-    "tap": "^10.7.0"
+    "rimraf": "^2.6.2",
+    "tap": "^12.0.1"
  },
  "files": [
    "which.js",
@ -64,5 +61,5 @@
    "postversion": "npm run changelog && git add CHANGELOG.md && git commit -m 'update changelog - '${npm_package_version}",
    "test": "tap test/*.js --cov"
  },
-  "version": "1.3.0"
+  "version": "1.3.1"
 }
--- a/app/package-lock.json
+++ b/app/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "TheDesk",
-  "version": "15.4.0",
+  "version": "15.5.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -456,7 +456,7 @@
        "growly": "1.3.0",
        "semver": "5.5.0",
        "shellwords": "0.1.1",
-        "which": "1.3.0"
+        "which": "1.3.1"
      }
    },
    "oauth-sign": {
@ -711,9 +711,9 @@
      }
    },
    "which": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
      "requires": {
        "isexe": "2.0.0"
      }
--- a/app/package.json
+++ b/app/package.json
@ -1,6 +1,6 @@
 {
  "name": "TheDesk",
-  "version": "15.5.0",
+  "version": "15.6.0",
  "description": "TheDesk on Mastodonはシンプルと多機能を両立したデスクトップ向けクライアントです",
  "main": "main.js",
  "scripts": {
--- a/app/setting.html
+++ b/app/setting.html
@ -35,7 +35,8 @@
 		<input type="text" style="width:50px" id="popup">秒 
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
 		<br>
-		<h5>ネイティブ通知設定</h5><a onclick="notftest()" class="pointer">通知テスト</a>
+		<h5>ネイティブ通知設定</h5>
+		Windows 10の最新バージョンでは通知が表示されません。これは既知のバグですが解決が難しいため保留しています。<br><a onclick="notftest()" class="pointer">通知テスト</a>
 		<br>
 		<input class="with-gap" onchange="settings()" name="notf" type="radio" id="ntf_yes" value="yes" />
 		<label for="ntf_yes">はい</label>
@ -189,6 +190,22 @@
 		<br>
 	</div>
 	</li>
+	<li>
+		<div class="collapsible-header">
+				<i class="material-icons">keyboard</i>キーボードショートカットの設定
+		</div>
+		<div class="collapsible-body">
+			<h5>簡単文字入力</h5>
+			絵文字やタグ、&gt;BTなどを登録しておくとすぐに入力できます。<br>
+			Ctrl+Shift+1:<input type="text" style="width:150px" id="oks-1">
+			<button onclick="oks(1)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
+			Ctrl+Shift+2:<input type="text" style="width:150px" id="oks-2">
+			<button onclick="oks(2)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
+			Ctrl+Shift+3:<input type="text" style="width:150px" id="oks-3">
+			<button onclick="oks(3)" class="btn waves-effect" style="width:100px;">設定</button><br><br>
+
+		</div>
+	</li>
 	<li>
 		<div class="collapsible-header">
 				<i class="material-icons">bookmark</i>ミュート・強調の設定
@ -229,6 +246,12 @@
 				テンプレート:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL<br>
 				iTunes NowPlayingでも{url}以外のテンプレートに従ってトゥートされます。また、作曲家{composer}/サンプルレート{hz}が有効です。<br>
 			<button onclick="spotifySave()" class="btn waves-effect" style="width:100px;">設定</button>
+			<h5>Spotifyでアルバムアートワークを添付する</h5>
+			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_yes" value="yes" />
+			<label for="awk_yes">はい</label>
+			<input class="with-gap" onchange="spotifyFlagSave()" name="awk" type="radio" id="awk_no" value="no" />
+			<label for="awk_no">いいえ</label>
+			<br>
 		</div>
 	</li>
 </ul>
--- a/node_modules/.bin/semver
+++ b/node_modules/.bin/semver
@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../semver/bin/semver" "$@"
-  ret=$?
-else 
-  node  "$basedir/../semver/bin/semver" "$@"
-  ret=$?
-fi
-exit $ret
--- a/node_modules/.bin/semver.cmd
+++ b/node_modules/.bin/semver.cmd
@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\semver\bin\semver" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\semver\bin\semver" %*
-)
--- a/node_modules/.bin/uuid
+++ b/node_modules/.bin/uuid
@ -1 +0,0 @@
-../node-uuid/bin/uuid
--- a/node_modules/.bin/which
+++ b/node_modules/.bin/which
@ -1,15 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*) basedir=`cygpath -w "$basedir"`;;
-esac
-
-if [ -x "$basedir/node" ]; then
-  "$basedir/node"  "$basedir/../which/bin/which" "$@"
-  ret=$?
-else 
-  node  "$basedir/../which/bin/which" "$@"
-  ret=$?
-fi
-exit $ret
--- a/node_modules/.bin/which.cmd
+++ b/node_modules/.bin/which.cmd
@ -1,7 +0,0 @@
-@IF EXIST "%~dp0\node.exe" (
-  "%~dp0\node.exe"  "%~dp0\..\which\bin\which" %*
-) ELSE (
-  @SETLOCAL
-  @SET PATHEXT=%PATHEXT:;.JS;=;%
-  node  "%~dp0\..\which\bin\which" %*
-)
--- a/node_modules/growly/HISTORY.md
+++ b/node_modules/growly/HISTORY.md
@ -1,5 +0,0 @@
-1.1.0 / 2012-12-12 
-==================
-
- Default registration work lazily, and is performed on the first call to `Growly.notify()`.
- Added callback to `Growly.register()`.
--- a/node_modules/growly/README.md
+++ b/node_modules/growly/README.md
@ -1,95 +0,0 @@
-# Growly #
-
-Simple zero-dependency Growl notifications using GNTP.
-
-## Installation ##
-
-Install growly using `npm`:
-
-```
-npm install growly
-```
-
-And then require it:
-
-```javascript
-var growly = require('growly');
-```
-
-This module uses the Growl Network Transport Protocol (GNTP) which was implemented in Growl since version 1.3, so you **must have an appropriate version of Growl installed** for Growly to work.
-
-## Example ##
-
-Sending a minimal Growl notification:
-
-```javascript
-var growly = require('growly');
-
-growly.notify('This is as easy as it gets', { title: 'Hello, World!' });
-```
-
-More examples can be found in the *example/* directory.
-
-## Usage ##
-
-The growly module exposes only three methods: `Growly.register()`, `Growly.notify()`, and `Growly.setHost()`.
-
-### Growly.register(appname, [appicon], [notifications], [callback]) ###
-
-Registers a new application with Growl. Registration is completely optional since it will be performed automatically for you with sensible defaults. Useful if you want your application, with its own icon and types of notifications, to show up in Growl's prefence panel.
-
-  - `appname` the name of the application (required.)
-  - `appicon` url, file path, or Buffer instance for an application icon image.
-  - `notifications` a list of defined notification types with the following properties:
-    - `.label` name used to identify the type of notification being used (required.)
-    - `.dispname` name users will see in Growl's preference panel (defaults to `.label`.)
-    - `.enabled` whether or not notifications of this type are enabled (defaults to true.)
-  - `callback` called when the registration completes; if registration fails, the first argument will be an Error object.
-
-An example:
-
-```javascript
-growly.register('My Application', 'path/to/icon.png', [
-    { label: 'success', dispname: 'Success' },
-    { label: 'warning', dispname: 'Warning', enabled: false }
-], function(err) {
-    console.log(err || 'Registration successful!');
-});
-```
-
-### Growly.notify(text, [opts], [callback]) ###
-
-Sends a Growl notification. If an application wasn't registered beforehand with `growly.register()`, a default application will automatically be registered beforesending the notification.
-
-  - `text` the body of the notification.
-  - `opts` an object with the following properties:
-    - `.title` title of the notification.
-    - `.icon` url, file path, or Buffer instance for the notification's icon.
-    - `.sticky` whether or not to sticky the notification (defaults to false.)
-    - `.label` type of notification to use (defaults to the first registered notification type.)
-    - `.priority` the priority of the notification from lowest (-2) to highest (2).
-    - `.coalescingId` replace/update the matching previous notification. May be ignored.
-  - `callback` called when the user has closed/clicked the notification. The callback is passed an Error object `err` as the first argument when the notification fails; otherwise, the second argument `action` is a string that'll describe which action has been taken by the user (either 'closed' or 'clicked'.)
-
-An example:
-
-```javascript
-/* Assuming an application was registered with a notification type labeled 'warning'. */
-growly.notify('Stuffs broken!', { label: 'warning' }, function(err, action) {
-    console.log('Action:', action);
-});
-```
-
-### Growly.setHost(host, port) ###
-
-Set the host and port that Growl (GNTP) requests will be sent to. Using this method is optional since GNTP defaults to using host 'localhost' and port 23053.
-
-## License ##
-
-Copyright (C) 2014 Ibrahim Al-Rajhi <abrahamalrajhi@gmail.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/node_modules/growly/example/bakery.js
+++ b/node_modules/growly/example/bakery.js
@ -1,22 +0,0 @@
-var growly = require('../lib/growly.js');
-
-var notifications = [
-        { label: 'muffin', dispname: 'Muffin' },
-        { label: 'cake', dispname: 'Cake' }
-    ],
-    muffinopts = { label: 'muffin', icon: 'muffin.png' },
-    cakeopts = { label: 'cake', title: 'Cake is ready!', icon: 'cake.png', sticky: true };
-
-growly.register('Bakery', 'muffin.png', notifications, function(err) {
-    if (err) { 
-        console.log(err);
-        return;
-    }
-
-    growly.notify('Looks like it is half past muffin time!', muffinopts);
-
-    growly.notify('Click to deliver', cakeopts, function(err, action) {
-        console.log('You', action, 'the notification, so the cake is on its way!');
-    });
-});
-
--- a/node_modules/growly/example/cake.png
+++ b/node_modules/growly/example/cake.png
--- a/node_modules/growly/example/muffin.png
+++ b/node_modules/growly/example/muffin.png
--- a/node_modules/growly/example/simple.js
+++ b/node_modules/growly/example/simple.js
@ -1,3 +0,0 @@
-var growly = require('../lib/growly.js');
-
-growly.notify('Hello, world!');
--- a/node_modules/growly/lib/gntp.js
+++ b/node_modules/growly/lib/gntp.js
@ -1,200 +0,0 @@
-var net = require('net'),
-    crypto = require('crypto'),
-    format = require('util').format,
-    fs = require('fs');
-
-var nl = '\r\n';
-
-/**
- * Create a new GNTP request of the given `type`.
- *
- * @param {String} type either NOTIFY or REGISTER
- * @api private
- */
-
-function GNTP(type, opts) {
-    opts = opts || {};
-    this.type = type;
-    this.host = opts.host || 'localhost';
-    this.port = opts.port || 23053;
-    this.request = 'GNTP/1.0 ' + type + ' NONE' + nl;
-    this.resources = [];
-    this.attempts = 0;
-    this.maxAttempts = 5;
-}
-
-/**
- * Build a response object from the given `resp` response string.
- *
- * The response object has a key/value pair for every header in the response, and 
- * a `.state` property equal to either OK, ERROR, or CALLBACK.
- *
- * An example GNTP response:
- *
- *     GNTP/1.0 -OK NONE\r\n
- *     Response-Action: REGISTER\r\n
- *     \r\n
- *
- *  Which would parse to:
- *      
- *      { state: 'OK', 'Response-Action': 'REGISTER' }
- *
- * @param {String} resp
- * @return {Object}
- * @api private
- */
-
-GNTP.prototype.parseResp = function(resp) {
-    var parsed = {}, head, body;
-    resp = resp.slice(0, resp.indexOf(nl + nl)).split(nl);
-    head = resp[0];
-    body = resp.slice(1);
-
-    parsed.state = head.match(/-(OK|ERROR|CALLBACK)/)[0].slice(1);
-    body.forEach(function(ln) {
-        ln = ln.split(': ');
-        parsed[ln[0]] = ln[1];
-    });
-
-    return parsed;
-};
-
-/**
- * Call `GNTP.send()` with the given arguments after a certain delay.
- *
- * @api private
- */
-
-GNTP.prototype.retry = function() {
-    var self = this, 
-        args = arguments;
-    setTimeout(function() {
-        self.send.apply(self, args);
-    }, 750);
-};
-
-
-/**
- * Add a resource to the GNTP request.
- *
- * @param {Buffer} file
- * @return {String}
- * @api private
- */
-
-GNTP.prototype.addResource = function(file) {
-    var id = crypto.createHash('md5').update(file).digest('hex'),
-        header = 'Identifier: ' + id + nl + 'Length: ' + file.length + nl + nl;
-    this.resources.push({ header: header, file: file });
-    return 'x-growl-resource://' + id;
-};
-
-/**
- * Append another header `name` with a value of `val` to the request. If `val` is
- * undefined, the header will be left out.
- *
- * @param {String} name
- * @param {String} val
- * @api public
- */
-
-GNTP.prototype.add = function(name, val) {
-    if (val === undefined) 
-        return;
-
-    /* Handle icon files when they're image paths or Buffers. */
-    if (/-Icon/.test(name) && !/^https?:\/\//.test(val) ) {
-        if (/\.(png|gif|jpe?g)$/.test(val))
-            val = this.addResource(fs.readFileSync(val));
-        else if (val instanceof Buffer)
-            val = this.addResource(val);
-    }
-
-    this.request += name + ': ' + val + nl;
-};
-
-/**
- * Append a newline to the request.
- *
- * @api public
- */
-
-GNTP.prototype.newline = function() {
-    this.request += nl;
-};
-
-/**
- * Send the GNTP request, calling `callback` after successfully sending the 
- * request.
- *
- * An example GNTP request:
- *
- *     GNTP/1.0 REGISTER NONE\r\n
- *     Application-Name: Growly.js\r\n
- *     Notifications-Count: 1\r\n
- *     \r\n
- *     Notification-Name: default\r\n
- *     Notification-Display-Name: Default Notification\r\n
- *     Notification-Enabled: True\r\n
- *     \r\n
- * 
- * @param {Function} callback which will be passed the parsed response
- * @api public
- */
-
-GNTP.prototype.send = function(callback) {
-    var self = this,
-        socket = net.connect(this.port, this.host),
-        resp = '';
-
-    callback = callback || function() {};
-
-    this.attempts += 1;
-
-    socket.on('connect', function() {
-        socket.write(self.request);
-
-        self.resources.forEach(function(res) {
-            socket.write(res.header);
-            socket.write(res.file);
-            socket.write(nl + nl);
-        });
-    });
-
-    socket.on('data', function(data) {
-        resp += data.toString();
-
-        /* Wait until we have a complete response which is signaled by two CRLF's. */
-        if (resp.slice(resp.length - 4) !== (nl + nl)) return; 
-
-        resp = self.parseResp(resp); 
-
-        /* We have to manually close the connection for certain responses; otherwise,
-           reset `resp` to prepare for the next response chunk.  */
-        if (resp.state === 'ERROR' || resp.state === 'CALLBACK')
-            socket.end();
-        else
-            resp = '';
-    });
-
-    socket.on('end', function() {
-        /* Retry on 200 (timed out), 401 (unknown app), or 402 (unknown notification). */
-        if (['200', '401', '402'].indexOf(resp['Error-Code']) >= 0) {
-            if (self.attempts <= self.maxAttempts) {
-                self.retry(callback);
-            } else {
-                var msg = 'GNTP request to "%s:%d" failed with error code %s (%s)';
-                callback(new Error(format(msg, self.host, self.port, resp['Error-Code'], resp['Error-Description'])));
-            }
-        } else {
-            callback(undefined, resp);
-        }
-    });
-
-    socket.on('error', function() {
-        callback(new Error(format('Error while sending GNTP request to "%s:%d"', self.host, self.port)));
-        socket.destroy();
-    });
-};
-
-module.exports = GNTP;
--- a/node_modules/growly/lib/growly.js
+++ b/node_modules/growly/lib/growly.js
@ -1,193 +0,0 @@
-var GNTP = require('./gntp.js');
-
-/**
- * Interface for registering Growl applications and sending Growl notifications.
- *
- * @api private
- */
-
-function Growly() {
-    this.appname = 'Growly';
-    this.notifications = undefined;
-    this.labels = undefined;
-    this.count = 0;
-    this.registered = false;
-    this.host = undefined;
-    this.port = undefined;
-}
-
-/**
- * Returns an array of label strings extracted from each notification object in
- * `Growly.notifications`.
- *
- * @param {Array} notifications
- * @return {Array} notification labels
- * @api private
- */
-
-Growly.prototype.getLabels = function() {
-    return this.notifications.map(function(notif) {
-        return notif.label;
-    });
-};
-
-/**
- * Set the host to be used by GNTP requests.
- *
- * @param {String} host
- * @param {Number} port
- * @api public
- */
-
-Growly.prototype.setHost = function(host, port) {
-    this.host = host;
-    this.port = port;
-};
-
-/**
- * Register an application with the name `appname` (required), icon `appicon`, and
- * a list of notification types `notifications`. If provided, `callback` will be
- * called when the request completes with the first argument being an `err` error
- * object if the request failed.
- *
- * Each object in the `notifications` array defines a type of notification the
- * application will have with the following properties:
- *
- *  - `.label` name used to identify the type of notification being used (required)
- *  - `.dispname` name users will see in Growl's preference panel (defaults to `.label`)
- *  - `.enabled` whether or not notifications of this type are enabled (defaults to true)
- *  - `.icon` default icon notifications of this type should use (url, file path, or Buffer object)
- *
- *  Example registration:
- *
- *      growl.register('My Application', 'path/to/icon.png', [
- *          { label: 'success', dispname: 'Success', icon: 'path/to/success.png' },
- *          { label: 'warning', dispname: 'Warning', icon: 'path/to/warning.png', enabled: false }
- *      ], function(err) { console.log(err || 'Registration successful!'); });
- *
- * @param {String} appname
- * @param {String|Buffer} appicon
- * @param {Array} notifications
- * @param {Function} callback
- * @api public
- */
-
-Growly.prototype.register = function(appname, appicon, notifications, callback) {
-    var gntp;
-
-    if (typeof appicon === 'object') {
-        notifications = appicon;
-        appicon = undefined;
-    }
-
-    if (notifications === undefined || !notifications.length) {
-        notifications = [{ label: 'default', dispname: 'Default Notification', enabled: true }];
-    }
-
-    if (typeof arguments[arguments.length - 1] === 'function') {
-        callback = arguments[arguments.length - 1];
-    } else {
-        callback = function() {};
-    }
-
-    this.appname = appname;
-    this.notifications = notifications;
-    this.labels = this.getLabels();
-    this.registered = true;
-
-    gntp = new GNTP('REGISTER', { host: this.host, port: this.port });
-    gntp.add('Application-Name', appname);
-    gntp.add('Application-Icon', appicon);
-    gntp.add('Notifications-Count', notifications.length);
-    gntp.newline();
-
-    notifications.forEach(function(notif) {
-        if (notif.enabled === undefined) notif.enabled = true;
-        gntp.add('Notification-Name', notif.label);
-        gntp.add('Notification-Display-Name', notif.dispname);
-        gntp.add('Notification-Enabled', notif.enabled ? 'True' : 'False');
-        gntp.add('Notification-Icon', notif.icon);
-        gntp.newline();
-    });
-
-    gntp.send(callback);
-};
-
-/**
- * Send a notification with `text` content. Growly will lazily register itself
- * if the user hasn't already before sending the notification.
- *
- * A notification can have the following `opts` options:
- *
- *  - `.label` type of notification to use (defaults to the first registered type)
- *  - `.title` title of the notification
- *  - `.icon` url, file path, or Buffer instance for the notification's icon.
- *  - `.sticky` whether or not to sticky the notification (defaults to false)
- *  - `.priority` the priority of the notification from lowest (-2) to highest (2)
- *  - `.coalescingId` replace/update the matching previous notification. May be ignored.
- *
- * If provided, `callback` will be called when the user interacts with the notification.
- * The first argument will be an `err` error object, and the second argument an `action`
- * string equal to either 'clicked' or 'closed' (whichever action the user took.)
- *
- * Example notification:
- *
- *     growl.notify('Stuffs broken!', { label: 'warning' }, function(err, action) {
- *         console.log('Action:', action);
- *     });
- *
- * @param {String} text
- * @param {Object} opts
- * @param {Function} callback
- * @api public
- */
-
-Growly.prototype.notify = function(text, opts, callback) {
-    var self = this,
-        gntp;
-
-    /* Lazy registration. */
-    if (!this.registered) {
-        this.register(this.appname, function(err) {
-            if (err) console.log(err);
-            self.notify.call(self, text, opts, callback);
-        });
-        return;
-    }
-
-    opts = opts || {};
-
-    if (typeof opts === 'function') {
-        callback = opts;
-        opts = {};
-    }
-
-    gntp = new GNTP('NOTIFY', { host: this.host, port: this.port });
-    gntp.add('Application-Name', this.appname);
-    gntp.add('Notification-Name', opts.label || this.labels[0]);
-    gntp.add('Notification-ID', ++this.count);
-    gntp.add('Notification-Title', opts.title);
-    gntp.add('Notification-Text', text);
-    gntp.add('Notification-Sticky', opts.sticky ? 'True' : 'False');
-    gntp.add('Notification-Priority', opts.priority);
-    gntp.add('Notification-Icon', opts.icon);
-    gntp.add('Notification-Coalescing-ID', opts.coalescingId || undefined);
-    gntp.add('Notification-Callback-Context', callback ? 'context' : undefined);
-    gntp.add('Notification-Callback-Context-Type', callback ? 'string' : undefined);
-    gntp.add('Notification-Callback-Target', undefined);
-    gntp.newline();
-
-    gntp.send(function(err, resp) {
-        if (callback && err) {
-            callback(err);
-        } else if (callback && resp.state === 'CALLBACK') {
-            callback(undefined, resp['Notification-Callback-Result'].toLowerCase());
-        }
-    });
-};
-
-/**
- * Expose an instance of the Growly object.
- */
-
-module.exports = new Growly();
--- a/node_modules/growly/package.json
+++ b/node_modules/growly/package.json
@ -1,57 +0,0 @@
-{
-  "_from": "growly@^1.3.0",
-  "_id": "growly@1.3.0",
-  "_inBundle": false,
-  "_integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-  "_location": "/growly",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "growly@^1.3.0",
-    "name": "growly",
-    "escapedName": "growly",
-    "rawSpec": "^1.3.0",
-    "saveSpec": null,
-    "fetchSpec": "^1.3.0"
-  },
-  "_requiredBy": [
-    "/node-notifier"
-  ],
-  "_resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-  "_shasum": "f10748cbe76af964b7c96c93c6bcc28af120c081",
-  "_spec": "growly@^1.3.0",
-  "_where": "C:\\Users\\ryuki\\TheDesk\\node_modules\\node-notifier",
-  "author": {
-    "name": "Ibrahim Al-Rajhi",
-    "email": "abrahamalrajhi@gmail.com",
-    "url": "http://ibrahimalrajhi.com/"
-  },
-  "bugs": {
-    "url": "http://github.com/theabraham/growly/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "Simple zero-dependency Growl notifications using GNTP.",
-  "directories": {
-    "example": "example",
-    "lib": "lib"
-  },
-  "homepage": "https://github.com/theabraham/growly#readme",
-  "keywords": [
-    "growl",
-    "growly",
-    "snarl",
-    "notifications",
-    "gntp",
-    "messages"
-  ],
-  "license": "MIT",
-  "main": "lib/growly.js",
-  "name": "growly",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/theabraham/growly.git"
-  },
-  "version": "1.3.0"
-}
--- a/node_modules/isexe/.npmignore
+++ b/node_modules/isexe/.npmignore
@ -1,2 +0,0 @@
-.nyc_output/
-coverage/
--- a/node_modules/isexe/LICENSE
+++ b/node_modules/isexe/LICENSE
@ -1,15 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/node_modules/isexe/README.md
+++ b/node_modules/isexe/README.md
@ -1,51 +0,0 @@
-# isexe
-
-Minimal module to check if a file is executable, and a normal file.
-
-Uses `fs.stat` and tests against the `PATHEXT` environment variable on
-Windows.
-
-## USAGE
-
-```javascript
-var isexe = require('isexe')
-isexe('some-file-name', function (err, isExe) {
-  if (err) {
-    console.error('probably file does not exist or something', err)
-  } else if (isExe) {
-    console.error('this thing can be run')
-  } else {
-    console.error('cannot be run')
-  }
-})
-
-// same thing but synchronous, throws errors
-var isExe = isexe.sync('some-file-name')
-
-// treat errors as just "not executable"
-isexe('maybe-missing-file', { ignoreErrors: true }, callback)
-var isExe = isexe.sync('maybe-missing-file', { ignoreErrors: true })
-```
-
-## API
-
-### `isexe(path, [options], [callback])`
-
-Check if the path is executable.  If no callback provided, and a
-global `Promise` object is available, then a Promise will be returned.
-
-Will raise whatever errors may be raised by `fs.stat`, unless
-`options.ignoreErrors` is set to true.
-
-### `isexe.sync(path, [options])`
-
-Same as `isexe` but returns the value and throws any errors raised.
-
-### Options
-
-* `ignoreErrors` Treat all errors as "no, this is not executable", but
-  don't raise them.
-* `uid` Number to use as the user id
-* `gid` Number to use as the group id
-* `pathExt` List of path extensions to use instead of `PATHEXT`
-  environment variable on Windows.
--- a/node_modules/isexe/index.js
+++ b/node_modules/isexe/index.js
@ -1,57 +0,0 @@
-var fs = require('fs')
-var core
-if (process.platform === 'win32' || global.TESTING_WINDOWS) {
-  core = require('./windows.js')
-} else {
-  core = require('./mode.js')
-}
-
-module.exports = isexe
-isexe.sync = sync
-
-function isexe (path, options, cb) {
-  if (typeof options === 'function') {
-    cb = options
-    options = {}
-  }
-
-  if (!cb) {
-    if (typeof Promise !== 'function') {
-      throw new TypeError('callback not provided')
-    }
-
-    return new Promise(function (resolve, reject) {
-      isexe(path, options || {}, function (er, is) {
-        if (er) {
-          reject(er)
-        } else {
-          resolve(is)
-        }
-      })
-    })
-  }
-
-  core(path, options || {}, function (er, is) {
-    // ignore EACCES because that just means we aren't allowed to run it
-    if (er) {
-      if (er.code === 'EACCES' || options && options.ignoreErrors) {
-        er = null
-        is = false
-      }
-    }
-    cb(er, is)
-  })
-}
-
-function sync (path, options) {
-  // my kingdom for a filtered catch
-  try {
-    return core.sync(path, options || {})
-  } catch (er) {
-    if (options && options.ignoreErrors || er.code === 'EACCES') {
-      return false
-    } else {
-      throw er
-    }
-  }
-}
--- a/node_modules/isexe/mode.js
+++ b/node_modules/isexe/mode.js
@ -1,41 +0,0 @@
-module.exports = isexe
-isexe.sync = sync
-
-var fs = require('fs')
-
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, options))
-  })
-}
-
-function sync (path, options) {
-  return checkStat(fs.statSync(path), options)
-}
-
-function checkStat (stat, options) {
-  return stat.isFile() && checkMode(stat, options)
-}
-
-function checkMode (stat, options) {
-  var mod = stat.mode
-  var uid = stat.uid
-  var gid = stat.gid
-
-  var myUid = options.uid !== undefined ?
-    options.uid : process.getuid && process.getuid()
-  var myGid = options.gid !== undefined ?
-    options.gid : process.getgid && process.getgid()
-
-  var u = parseInt('100', 8)
-  var g = parseInt('010', 8)
-  var o = parseInt('001', 8)
-  var ug = u | g
-
-  var ret = (mod & o) ||
-    (mod & g) && gid === myGid ||
-    (mod & u) && uid === myUid ||
-    (mod & ug) && myUid === 0
-
-  return ret
-}
--- a/node_modules/isexe/package.json
+++ b/node_modules/isexe/package.json
@ -1,60 +0,0 @@
-{
-  "_from": "isexe@^2.0.0",
-  "_id": "isexe@2.0.0",
-  "_inBundle": false,
-  "_integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-  "_location": "/isexe",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "isexe@^2.0.0",
-    "name": "isexe",
-    "escapedName": "isexe",
-    "rawSpec": "^2.0.0",
-    "saveSpec": null,
-    "fetchSpec": "^2.0.0"
-  },
-  "_requiredBy": [
-    "/which"
-  ],
-  "_resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-  "_shasum": "e8fbf374dc556ff8947a10dcb0572d633f2cfa10",
-  "_spec": "isexe@^2.0.0",
-  "_where": "C:\\Users\\ryuki\\TheDesk\\node_modules\\which",
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/isexe/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "Minimal module to check if a file is executable.",
-  "devDependencies": {
-    "mkdirp": "^0.5.1",
-    "rimraf": "^2.5.0",
-    "tap": "^10.3.0"
-  },
-  "directories": {
-    "test": "test"
-  },
-  "homepage": "https://github.com/isaacs/isexe#readme",
-  "keywords": [],
-  "license": "ISC",
-  "main": "index.js",
-  "name": "isexe",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/isaacs/isexe.git"
-  },
-  "scripts": {
-    "postpublish": "git push origin --all; git push origin --tags",
-    "postversion": "npm publish",
-    "preversion": "npm test",
-    "test": "tap test/*.js --100"
-  },
-  "version": "2.0.0"
-}
--- a/node_modules/isexe/test/basic.js
+++ b/node_modules/isexe/test/basic.js
@ -1,221 +0,0 @@
-var t = require('tap')
-var fs = require('fs')
-var path = require('path')
-var fixture = path.resolve(__dirname, 'fixtures')
-var meow = fixture + '/meow.cat'
-var mine = fixture + '/mine.cat'
-var ours = fixture + '/ours.cat'
-var fail = fixture + '/fail.false'
-var noent = fixture + '/enoent.exe'
-var mkdirp = require('mkdirp')
-var rimraf = require('rimraf')
-
-var isWindows = process.platform === 'win32'
-var hasAccess = typeof fs.access === 'function'
-var winSkip = isWindows && 'windows'
-var accessSkip = !hasAccess && 'no fs.access function'
-var hasPromise = typeof Promise === 'function'
-var promiseSkip = !hasPromise && 'no global Promise'
-
-function reset () {
-  delete require.cache[require.resolve('../')]
-  return require('../')
-}
-
-t.test('setup fixtures', function (t) {
-  rimraf.sync(fixture)
-  mkdirp.sync(fixture)
-  fs.writeFileSync(meow, '#!/usr/bin/env cat\nmeow\n')
-  fs.chmodSync(meow, parseInt('0755', 8))
-  fs.writeFileSync(fail, '#!/usr/bin/env false\n')
-  fs.chmodSync(fail, parseInt('0644', 8))
-  fs.writeFileSync(mine, '#!/usr/bin/env cat\nmine\n')
-  fs.chmodSync(mine, parseInt('0744', 8))
-  fs.writeFileSync(ours, '#!/usr/bin/env cat\nours\n')
-  fs.chmodSync(ours, parseInt('0754', 8))
-  t.end()
-})
-
-t.test('promise', { skip: promiseSkip }, function (t) {
-  var isexe = reset()
-  t.test('meow async', function (t) {
-    isexe(meow).then(function (is) {
-      t.ok(is)
-      t.end()
-    })
-  })
-  t.test('fail async', function (t) {
-    isexe(fail).then(function (is) {
-      t.notOk(is)
-      t.end()
-    })
-  })
-  t.test('noent async', function (t) {
-    isexe(noent).catch(function (er) {
-      t.ok(er)
-      t.end()
-    })
-  })
-  t.test('noent ignore async', function (t) {
-    isexe(noent, { ignoreErrors: true }).then(function (is) {
-      t.notOk(is)
-      t.end()
-    })
-  })
-  t.end()
-})
-
-t.test('no promise', function (t) {
-  global.Promise = null
-  var isexe = reset()
-  t.throws('try to meow a promise', function () {
-    isexe(meow)
-  })
-  t.end()
-})
-
-t.test('access', { skip: accessSkip || winSkip }, function (t) {
-  runTest(t)
-})
-
-t.test('mode', { skip: winSkip }, function (t) {
-  delete fs.access
-  delete fs.accessSync
-  var isexe = reset()
-  t.ok(isexe.sync(ours, { uid: 0, gid: 0 }))
-  t.ok(isexe.sync(mine, { uid: 0, gid: 0 }))
-  runTest(t)
-})
-
-t.test('windows', function (t) {
-  global.TESTING_WINDOWS = true
-  var pathExt = '.EXE;.CAT;.CMD;.COM'
-  t.test('pathExt option', function (t) {
-    runTest(t, { pathExt: '.EXE;.CAT;.CMD;.COM' })
-  })
-  t.test('pathExt env', function (t) {
-    process.env.PATHEXT = pathExt
-    runTest(t)
-  })
-  t.test('no pathExt', function (t) {
-    // with a pathExt of '', any filename is fine.
-    // so the "fail" one would still pass.
-    runTest(t, { pathExt: '', skipFail: true })
-  })
-  t.test('pathext with empty entry', function (t) {
-    // with a pathExt of '', any filename is fine.
-    // so the "fail" one would still pass.
-    runTest(t, { pathExt: ';' + pathExt, skipFail: true })
-  })
-  t.end()
-})
-
-t.test('cleanup', function (t) {
-  rimraf.sync(fixture)
-  t.end()
-})
-
-function runTest (t, options) {
-  var isexe = reset()
-
-  var optionsIgnore = Object.create(options || {})
-  optionsIgnore.ignoreErrors = true
-
-  if (!options || !options.skipFail) {
-    t.notOk(isexe.sync(fail, options))
-  }
-  t.notOk(isexe.sync(noent, optionsIgnore))
-  if (!options) {
-    t.ok(isexe.sync(meow))
-  } else {
-    t.ok(isexe.sync(meow, options))
-  }
-
-  t.ok(isexe.sync(mine, options))
-  t.ok(isexe.sync(ours, options))
-  t.throws(function () {
-    isexe.sync(noent, options)
-  })
-
-  t.test('meow async', function (t) {
-    if (!options) {
-      isexe(meow, function (er, is) {
-        if (er) {
-          throw er
-        }
-        t.ok(is)
-        t.end()
-      })
-    } else {
-      isexe(meow, options, function (er, is) {
-        if (er) {
-          throw er
-        }
-        t.ok(is)
-        t.end()
-      })
-    }
-  })
-
-  t.test('mine async', function (t) {
-    isexe(mine, options, function (er, is) {
-      if (er) {
-        throw er
-      }
-      t.ok(is)
-      t.end()
-    })
-  })
-
-  t.test('ours async', function (t) {
-    isexe(ours, options, function (er, is) {
-      if (er) {
-        throw er
-      }
-      t.ok(is)
-      t.end()
-    })
-  })
-
-  if (!options || !options.skipFail) {
-    t.test('fail async', function (t) {
-      isexe(fail, options, function (er, is) {
-        if (er) {
-          throw er
-        }
-        t.notOk(is)
-        t.end()
-      })
-    })
-  }
-
-  t.test('noent async', function (t) {
-    isexe(noent, options, function (er, is) {
-      t.ok(er)
-      t.notOk(is)
-      t.end()
-    })
-  })
-
-  t.test('noent ignore async', function (t) {
-    isexe(noent, optionsIgnore, function (er, is) {
-      if (er) {
-        throw er
-      }
-      t.notOk(is)
-      t.end()
-    })
-  })
-
-  t.test('directory is not executable', function (t) {
-    isexe(__dirname, options, function (er, is) {
-      if (er) {
-        throw er
-      }
-      t.notOk(is)
-      t.end()
-    })
-  })
-
-  t.end()
-}
--- a/node_modules/isexe/windows.js
+++ b/node_modules/isexe/windows.js
@ -1,42 +0,0 @@
-module.exports = isexe
-isexe.sync = sync
-
-var fs = require('fs')
-
-function checkPathExt (path, options) {
-  var pathext = options.pathExt !== undefined ?
-    options.pathExt : process.env.PATHEXT
-
-  if (!pathext) {
-    return true
-  }
-
-  pathext = pathext.split(';')
-  if (pathext.indexOf('') !== -1) {
-    return true
-  }
-  for (var i = 0; i < pathext.length; i++) {
-    var p = pathext[i].toLowerCase()
-    if (p && path.substr(-p.length).toLowerCase() === p) {
-      return true
-    }
-  }
-  return false
-}
-
-function checkStat (stat, path, options) {
-  if (!stat.isSymbolicLink() && !stat.isFile()) {
-    return false
-  }
-  return checkPathExt(path, options)
-}
-
-function isexe (path, options, cb) {
-  fs.stat(path, function (er, stat) {
-    cb(er, er ? false : checkStat(stat, path, options))
-  })
-}
-
-function sync (path, options) {
-  return checkStat(fs.statSync(path), path, options)
-}
--- a/node_modules/semver/LICENSE
+++ b/node_modules/semver/LICENSE
@ -1,15 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/node_modules/semver/README.md
+++ b/node_modules/semver/README.md
@ -1,388 +0,0 @@
-semver(1) -- The semantic versioner for npm
-===========================================
-
-## Install
-
-```bash
-npm install --save semver
-````
-
-## Usage
-
-As a node module:
-
-```js
-const semver = require('semver')
-
-semver.valid('1.2.3') // '1.2.3'
-semver.valid('a.b.c') // null
-semver.clean('  =v1.2.3   ') // '1.2.3'
-semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true
-semver.gt('1.2.3', '9.8.7') // false
-semver.lt('1.2.3', '9.8.7') // true
-semver.valid(semver.coerce('v2')) // '2.0.0'
-semver.valid(semver.coerce('42.6.7.9.3-alpha')) // '42.6.7'
-```
-
-As a command-line utility:
-
-```
-$ semver -h
-
-SemVer 5.3.0
-
-A JavaScript implementation of the http://semver.org/ specification
-Copyright Isaac Z. Schlueter
-
-Usage: semver [options] <version> [<version> [...]]
-Prints valid versions sorted by SemVer precedence
-
-Options:
-r --range <range>
-        Print versions that match the specified range.
-
-i --increment [<level>]
-        Increment a version by the specified level.  Level can
-        be one of: major, minor, patch, premajor, preminor,
-        prepatch, or prerelease.  Default level is 'patch'.
-        Only one version may be specified.
-
--preid <identifier>
-        Identifier to be used to prefix premajor, preminor,
-        prepatch or prerelease version increments.
-
-l --loose
-        Interpret versions and ranges loosely
-
-c --coerce
-        Coerce a string into SemVer if possible
-        (does not imply --loose)
-
-Program exits successfully if any valid version satisfies
-all supplied ranges, and prints all satisfying versions.
-
-If no satisfying versions are found, then exits failure.
-
-Versions are printed in ascending order, so supplying
-multiple versions to the utility will just sort them.
-```
-
-## Versions
-
-A "version" is described by the `v2.0.0` specification found at
-<http://semver.org/>.
-
-A leading `"="` or `"v"` character is stripped off and ignored.
-
-## Ranges
-
-A `version range` is a set of `comparators` which specify versions
-that satisfy the range.
-
-A `comparator` is composed of an `operator` and a `version`.  The set
-of primitive `operators` is:
-
-* `<` Less than
-* `<=` Less than or equal to
-* `>` Greater than
-* `>=` Greater than or equal to
-* `=` Equal.  If no operator is specified, then equality is assumed,
-  so this operator is optional, but MAY be included.
-
-For example, the comparator `>=1.2.7` would match the versions
-`1.2.7`, `1.2.8`, `2.5.3`, and `1.3.9`, but not the versions `1.2.6`
-or `1.1.0`.
-
-Comparators can be joined by whitespace to form a `comparator set`,
-which is satisfied by the **intersection** of all of the comparators
-it includes.
-
-A range is composed of one or more comparator sets, joined by `||`.  A
-version matches a range if and only if every comparator in at least
-one of the `||`-separated comparator sets is satisfied by the version.
-
-For example, the range `>=1.2.7 <1.3.0` would match the versions
-`1.2.7`, `1.2.8`, and `1.2.99`, but not the versions `1.2.6`, `1.3.0`,
-or `1.1.0`.
-
-The range `1.2.7 || >=1.2.9 <2.0.0` would match the versions `1.2.7`,
-`1.2.9`, and `1.4.6`, but not the versions `1.2.8` or `2.0.0`.
-
-### Prerelease Tags
-
-If a version has a prerelease tag (for example, `1.2.3-alpha.3`) then
-it will only be allowed to satisfy comparator sets if at least one
-comparator with the same `[major, minor, patch]` tuple also has a
-prerelease tag.
-
-For example, the range `>1.2.3-alpha.3` would be allowed to match the
-version `1.2.3-alpha.7`, but it would *not* be satisfied by
-`3.4.5-alpha.9`, even though `3.4.5-alpha.9` is technically "greater
-than" `1.2.3-alpha.3` according to the SemVer sort rules.  The version
-range only accepts prerelease tags on the `1.2.3` version.  The
-version `3.4.5` *would* satisfy the range, because it does not have a
-prerelease flag, and `3.4.5` is greater than `1.2.3-alpha.7`.
-
-The purpose for this behavior is twofold.  First, prerelease versions
-frequently are updated very quickly, and contain many breaking changes
-that are (by the author's design) not yet fit for public consumption.
-Therefore, by default, they are excluded from range matching
-semantics.
-
-Second, a user who has opted into using a prerelease version has
-clearly indicated the intent to use *that specific* set of
-alpha/beta/rc versions.  By including a prerelease tag in the range,
-the user is indicating that they are aware of the risk.  However, it
-is still not appropriate to assume that they have opted into taking a
-similar risk on the *next* set of prerelease versions.
-
-#### Prerelease Identifiers
-
-The method `.inc` takes an additional `identifier` string argument that
-will append the value of the string as a prerelease identifier:
-
-```javascript
-semver.inc('1.2.3', 'prerelease', 'beta')
-// '1.2.4-beta.0'
-```
-
-command-line example:
-
-```bash
-$ semver 1.2.3 -i prerelease --preid beta
-1.2.4-beta.0
-```
-
-Which then can be used to increment further:
-
-```bash
-$ semver 1.2.4-beta.0 -i prerelease
-1.2.4-beta.1
-```
-
-### Advanced Range Syntax
-
-Advanced range syntax desugars to primitive comparators in
-deterministic ways.
-
-Advanced ranges may be combined in the same way as primitive
-comparators using white space or `||`.
-
-#### Hyphen Ranges `X.Y.Z - A.B.C`
-
-Specifies an inclusive set.
-
-* `1.2.3 - 2.3.4` := `>=1.2.3 <=2.3.4`
-
-If a partial version is provided as the first version in the inclusive
-range, then the missing pieces are replaced with zeroes.
-
-* `1.2 - 2.3.4` := `>=1.2.0 <=2.3.4`
-
-If a partial version is provided as the second version in the
-inclusive range, then all versions that start with the supplied parts
-of the tuple are accepted, but nothing that would be greater than the
-provided tuple parts.
-
-* `1.2.3 - 2.3` := `>=1.2.3 <2.4.0`
-* `1.2.3 - 2` := `>=1.2.3 <3.0.0`
-
-#### X-Ranges `1.2.x` `1.X` `1.2.*` `*`
-
-Any of `X`, `x`, or `*` may be used to "stand in" for one of the
-numeric values in the `[major, minor, patch]` tuple.
-
-* `*` := `>=0.0.0` (Any version satisfies)
-* `1.x` := `>=1.0.0 <2.0.0` (Matching major version)
-* `1.2.x` := `>=1.2.0 <1.3.0` (Matching major and minor versions)
-
-A partial version range is treated as an X-Range, so the special
-character is in fact optional.
-
-* `""` (empty string) := `*` := `>=0.0.0`
-* `1` := `1.x.x` := `>=1.0.0 <2.0.0`
-* `1.2` := `1.2.x` := `>=1.2.0 <1.3.0`
-
-#### Tilde Ranges `~1.2.3` `~1.2` `~1`
-
-Allows patch-level changes if a minor version is specified on the
-comparator.  Allows minor-level changes if not.
-
-* `~1.2.3` := `>=1.2.3 <1.(2+1).0` := `>=1.2.3 <1.3.0`
-* `~1.2` := `>=1.2.0 <1.(2+1).0` := `>=1.2.0 <1.3.0` (Same as `1.2.x`)
-* `~1` := `>=1.0.0 <(1+1).0.0` := `>=1.0.0 <2.0.0` (Same as `1.x`)
-* `~0.2.3` := `>=0.2.3 <0.(2+1).0` := `>=0.2.3 <0.3.0`
-* `~0.2` := `>=0.2.0 <0.(2+1).0` := `>=0.2.0 <0.3.0` (Same as `0.2.x`)
-* `~0` := `>=0.0.0 <(0+1).0.0` := `>=0.0.0 <1.0.0` (Same as `0.x`)
-* `~1.2.3-beta.2` := `>=1.2.3-beta.2 <1.3.0` Note that prereleases in
-  the `1.2.3` version will be allowed, if they are greater than or
-  equal to `beta.2`.  So, `1.2.3-beta.4` would be allowed, but
-  `1.2.4-beta.2` would not, because it is a prerelease of a
-  different `[major, minor, patch]` tuple.
-
-#### Caret Ranges `^1.2.3` `^0.2.5` `^0.0.4`
-
-Allows changes that do not modify the left-most non-zero digit in the
-`[major, minor, patch]` tuple.  In other words, this allows patch and
-minor updates for versions `1.0.0` and above, patch updates for
-versions `0.X >=0.1.0`, and *no* updates for versions `0.0.X`.
-
-Many authors treat a `0.x` version as if the `x` were the major
-"breaking-change" indicator.
-
-Caret ranges are ideal when an author may make breaking changes
-between `0.2.4` and `0.3.0` releases, which is a common practice.
-However, it presumes that there will *not* be breaking changes between
-`0.2.4` and `0.2.5`.  It allows for changes that are presumed to be
-additive (but non-breaking), according to commonly observed practices.
-
-* `^1.2.3` := `>=1.2.3 <2.0.0`
-* `^0.2.3` := `>=0.2.3 <0.3.0`
-* `^0.0.3` := `>=0.0.3 <0.0.4`
-* `^1.2.3-beta.2` := `>=1.2.3-beta.2 <2.0.0` Note that prereleases in
-  the `1.2.3` version will be allowed, if they are greater than or
-  equal to `beta.2`.  So, `1.2.3-beta.4` would be allowed, but
-  `1.2.4-beta.2` would not, because it is a prerelease of a
-  different `[major, minor, patch]` tuple.
-* `^0.0.3-beta` := `>=0.0.3-beta <0.0.4`  Note that prereleases in the
-  `0.0.3` version *only* will be allowed, if they are greater than or
-  equal to `beta`.  So, `0.0.3-pr.2` would be allowed.
-
-When parsing caret ranges, a missing `patch` value desugars to the
-number `0`, but will allow flexibility within that value, even if the
-major and minor versions are both `0`.
-
-* `^1.2.x` := `>=1.2.0 <2.0.0`
-* `^0.0.x` := `>=0.0.0 <0.1.0`
-* `^0.0` := `>=0.0.0 <0.1.0`
-
-A missing `minor` and `patch` values will desugar to zero, but also
-allow flexibility within those values, even if the major version is
-zero.
-
-* `^1.x` := `>=1.0.0 <2.0.0`
-* `^0.x` := `>=0.0.0 <1.0.0`
-
-### Range Grammar
-
-Putting all this together, here is a Backus-Naur grammar for ranges,
-for the benefit of parser authors:
-
-```bnf
-range-set  ::= range ( logical-or range ) *
-logical-or ::= ( ' ' ) * '||' ( ' ' ) *
-range      ::= hyphen | simple ( ' ' simple ) * | ''
-hyphen     ::= partial ' - ' partial
-simple     ::= primitive | partial | tilde | caret
-primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
-partial    ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
-xr         ::= 'x' | 'X' | '*' | nr
-nr         ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
-tilde      ::= '~' partial
-caret      ::= '^' partial
-qualifier  ::= ( '-' pre )? ( '+' build )?
-pre        ::= parts
-build      ::= parts
-parts      ::= part ( '.' part ) *
-part       ::= nr | [-0-9A-Za-z]+
-```
-
-## Functions
-
-All methods and classes take a final `loose` boolean argument that, if
-true, will be more forgiving about not-quite-valid semver strings.
-The resulting output will always be 100% strict, of course.
-
-Strict-mode Comparators and Ranges will be strict about the SemVer
-strings that they parse.
-
-* `valid(v)`: Return the parsed version, or null if it's not valid.
-* `inc(v, release)`: Return the version incremented by the release
-  type (`major`,   `premajor`, `minor`, `preminor`, `patch`,
-  `prepatch`, or `prerelease`), or null if it's not valid
-  * `premajor` in one call will bump the version up to the next major
-    version and down to a prerelease of that major version.
-    `preminor`, and `prepatch` work the same way.
-  * If called from a non-prerelease version, the `prerelease` will work the
-    same as `prepatch`. It increments the patch version, then makes a
-    prerelease. If the input version is already a prerelease it simply
-    increments it.
-* `prerelease(v)`: Returns an array of prerelease components, or null
-  if none exist. Example: `prerelease('1.2.3-alpha.1') -> ['alpha', 1]`
-* `major(v)`: Return the major version number.
-* `minor(v)`: Return the minor version number.
-* `patch(v)`: Return the patch version number.
-* `intersects(r1, r2, loose)`: Return true if the two supplied ranges
-  or comparators intersect.
-
-### Comparison
-
-* `gt(v1, v2)`: `v1 > v2`
-* `gte(v1, v2)`: `v1 >= v2`
-* `lt(v1, v2)`: `v1 < v2`
-* `lte(v1, v2)`: `v1 <= v2`
-* `eq(v1, v2)`: `v1 == v2` This is true if they're logically equivalent,
-  even if they're not the exact same string.  You already know how to
-  compare strings.
-* `neq(v1, v2)`: `v1 != v2` The opposite of `eq`.
-* `cmp(v1, comparator, v2)`: Pass in a comparison string, and it'll call
-  the corresponding function above.  `"==="` and `"!=="` do simple
-  string comparison, but are included for completeness.  Throws if an
-  invalid comparison string is provided.
-* `compare(v1, v2)`: Return `0` if `v1 == v2`, or `1` if `v1` is greater, or `-1` if
-  `v2` is greater.  Sorts in ascending order if passed to `Array.sort()`.
-* `rcompare(v1, v2)`: The reverse of compare.  Sorts an array of versions
-  in descending order when passed to `Array.sort()`.
-* `diff(v1, v2)`: Returns difference between two versions by the release type
-  (`major`, `premajor`, `minor`, `preminor`, `patch`, `prepatch`, or `prerelease`),
-  or null if the versions are the same.
-
-### Comparators
-
-* `intersects(comparator)`: Return true if the comparators intersect
-
-### Ranges
-
-* `validRange(range)`: Return the valid range or null if it's not valid
-* `satisfies(version, range)`: Return true if the version satisfies the
-  range.
-* `maxSatisfying(versions, range)`: Return the highest version in the list
-  that satisfies the range, or `null` if none of them do.
-* `minSatisfying(versions, range)`: Return the lowest version in the list
-  that satisfies the range, or `null` if none of them do.
-* `gtr(version, range)`: Return `true` if version is greater than all the
-  versions possible in the range.
-* `ltr(version, range)`: Return `true` if version is less than all the
-  versions possible in the range.
-* `outside(version, range, hilo)`: Return true if the version is outside
-  the bounds of the range in either the high or low direction.  The
-  `hilo` argument must be either the string `'>'` or `'<'`.  (This is
-  the function called by `gtr` and `ltr`.)
-* `intersects(range)`: Return true if any of the ranges comparators intersect
-
-Note that, since ranges may be non-contiguous, a version might not be
-greater than a range, less than a range, *or* satisfy a range!  For
-example, the range `1.2 <1.2.9 || >2.0.0` would have a hole from `1.2.9`
-until `2.0.0`, so the version `1.2.10` would not be greater than the
-range (because `2.0.1` satisfies, which is higher), nor less than the
-range (since `1.2.8` satisfies, which is lower), and it also does not
-satisfy the range.
-
-If you want to know if a version satisfies or does not satisfy a
-range, use the `satisfies(version, range)` function.
-
-### Coercion
-
-* `coerce(version)`: Coerces a string to semver if possible
-
-This aims to provide a very forgiving translation of a non-semver
-string to semver. It looks for the first digit in a string, and
-consumes all remaining characters which satisfy at least a partial semver
-(e.g., `1`, `1.2`, `1.2.3`) up to the max permitted length (256 characters).
-Longer versions are simply truncated (`4.6.3.9.2-alpha2` becomes `4.6.3`).
-All surrounding text is simply ignored (`v3.4 replaces v3.3.1` becomes `3.4.0`).
-Only text which lacks digits will fail coercion (`version one` is not valid).
-The maximum  length for any semver component considered for coercion is 16 characters;
-longer components will be ignored (`10000000000000000.4.7.4` becomes `4.7.4`).
-The maximum value for any semver component is `Integer.MAX_SAFE_INTEGER || (2**53 - 1)`;
-higher value components are invalid (`9999999999999999.4.7.4` is likely invalid).
--- a/node_modules/semver/bin/semver
+++ b/node_modules/semver/bin/semver
@ -1,143 +0,0 @@
-#!/usr/bin/env node
-// Standalone semver comparison program.
-// Exits successfully and prints matching version(s) if
-// any supplied version is valid and passes all tests.
-
-var argv = process.argv.slice(2)
-  , versions = []
-  , range = []
-  , gt = []
-  , lt = []
-  , eq = []
-  , inc = null
-  , version = require("../package.json").version
-  , loose = false
-  , coerce = false
-  , identifier = undefined
-  , semver = require("../semver")
-  , reverse = false
-
-main()
-
-function main () {
-  if (!argv.length) return help()
-  while (argv.length) {
-    var a = argv.shift()
-    var i = a.indexOf('=')
-    if (i !== -1) {
-      a = a.slice(0, i)
-      argv.unshift(a.slice(i + 1))
-    }
-    switch (a) {
-      case "-rv": case "-rev": case "--rev": case "--reverse":
-        reverse = true
-        break
-      case "-l": case "--loose":
-        loose = true
-        break
-      case "-v": case "--version":
-        versions.push(argv.shift())
-        break
-      case "-i": case "--inc": case "--increment":
-        switch (argv[0]) {
-          case "major": case "minor": case "patch": case "prerelease":
-          case "premajor": case "preminor": case "prepatch":
-            inc = argv.shift()
-            break
-          default:
-            inc = "patch"
-            break
-        }
-        break
-      case "--preid":
-        identifier = argv.shift()
-        break
-      case "-r": case "--range":
-        range.push(argv.shift())
-        break
-      case "-c": case "--coerce":
-        coerce = true
-        break
-      case "-h": case "--help": case "-?":
-        return help()
-      default:
-        versions.push(a)
-        break
-    }
-  }
-
-  versions = versions.map(function (v) {
-    return coerce ? (semver.coerce(v) || {version: v}).version : v
-  }).filter(function (v) {
-    return semver.valid(v)
-  })
-  if (!versions.length) return fail()
-  if (inc && (versions.length !== 1 || range.length))
-    return failInc()
-
-  for (var i = 0, l = range.length; i < l ; i ++) {
-    versions = versions.filter(function (v) {
-      return semver.satisfies(v, range[i], loose)
-    })
-    if (!versions.length) return fail()
-  }
-  return success(versions)
-}
-
-function failInc () {
-  console.error("--inc can only be used on a single version with no range")
-  fail()
-}
-
-function fail () { process.exit(1) }
-
-function success () {
-  var compare = reverse ? "rcompare" : "compare"
-  versions.sort(function (a, b) {
-    return semver[compare](a, b, loose)
-  }).map(function (v) {
-    return semver.clean(v, loose)
-  }).map(function (v) {
-    return inc ? semver.inc(v, inc, loose, identifier) : v
-  }).forEach(function (v,i,_) { console.log(v) })
-}
-
-function help () {
-  console.log(["SemVer " + version
-              ,""
-              ,"A JavaScript implementation of the http://semver.org/ specification"
-              ,"Copyright Isaac Z. Schlueter"
-              ,""
-              ,"Usage: semver [options] <version> [<version> [...]]"
-              ,"Prints valid versions sorted by SemVer precedence"
-              ,""
-              ,"Options:"
-              ,"-r --range <range>"
-              ,"        Print versions that match the specified range."
-              ,""
-              ,"-i --increment [<level>]"
-              ,"        Increment a version by the specified level.  Level can"
-              ,"        be one of: major, minor, patch, premajor, preminor,"
-              ,"        prepatch, or prerelease.  Default level is 'patch'."
-              ,"        Only one version may be specified."
-              ,""
-              ,"--preid <identifier>"
-              ,"        Identifier to be used to prefix premajor, preminor,"
-              ,"        prepatch or prerelease version increments."
-              ,""
-              ,"-l --loose"
-              ,"        Interpret versions and ranges loosely"
-              ,""
-              ,"-c --coerce"
-              ,"        Coerce a string into SemVer if possible"
-              ,"        (does not imply --loose)"
-              ,""
-              ,"Program exits successfully if any valid version satisfies"
-              ,"all supplied ranges, and prints all satisfying versions."
-              ,""
-              ,"If no satisfying versions are found, then exits failure."
-              ,""
-              ,"Versions are printed in ascending order, so supplying"
-              ,"multiple versions to the utility will just sort them."
-              ].join("\n"))
-}
--- a/node_modules/semver/package.json
+++ b/node_modules/semver/package.json
@ -1,54 +0,0 @@
-{
-  "_from": "semver@^5.4.1",
-  "_id": "semver@5.5.0",
-  "_inBundle": false,
-  "_integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
-  "_location": "/semver",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "semver@^5.4.1",
-    "name": "semver",
-    "escapedName": "semver",
-    "rawSpec": "^5.4.1",
-    "saveSpec": null,
-    "fetchSpec": "^5.4.1"
-  },
-  "_requiredBy": [
-    "/node-notifier"
-  ],
-  "_resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
-  "_shasum": "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab",
-  "_spec": "semver@^5.4.1",
-  "_where": "C:\\Users\\ryuki\\TheDesk\\node_modules\\node-notifier",
-  "bin": {
-    "semver": "./bin/semver"
-  },
-  "bugs": {
-    "url": "https://github.com/npm/node-semver/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "The semantic version parser used by npm.",
-  "devDependencies": {
-    "tap": "^10.7.0"
-  },
-  "files": [
-    "bin",
-    "range.bnf",
-    "semver.js"
-  ],
-  "homepage": "https://github.com/npm/node-semver#readme",
-  "license": "ISC",
-  "main": "semver.js",
-  "name": "semver",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/npm/node-semver.git"
-  },
-  "scripts": {
-    "test": "tap test/*.js --cov -J"
-  },
-  "version": "5.5.0"
-}
--- a/node_modules/semver/range.bnf
+++ b/node_modules/semver/range.bnf
@ -1,16 +0,0 @@
-range-set  ::= range ( logical-or range ) *
-logical-or ::= ( ' ' ) * '||' ( ' ' ) *
-range      ::= hyphen | simple ( ' ' simple ) * | ''
-hyphen     ::= partial ' - ' partial
-simple     ::= primitive | partial | tilde | caret
-primitive  ::= ( '<' | '>' | '>=' | '<=' | '=' ) partial
-partial    ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
-xr         ::= 'x' | 'X' | '*' | nr
-nr         ::= '0' | [1-9] ( [0-9] ) *
-tilde      ::= '~' partial
-caret      ::= '^' partial
-qualifier  ::= ( '-' pre )? ( '+' build )?
-pre        ::= parts
-build      ::= parts
-parts      ::= part ( '.' part ) *
-part       ::= nr | [-0-9A-Za-z]+
--- a/node_modules/semver/semver.js
+++ b/node_modules/semver/semver.js
--- a/node_modules/shellwords/LICENSE
+++ b/node_modules/shellwords/LICENSE
@ -1,19 +0,0 @@
-Copyright (C) 2011 by Jimmy Cuadra
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--- a/node_modules/shellwords/README.md
+++ b/node_modules/shellwords/README.md
@ -1,19 +0,0 @@
-# Shellwords
-
-Shellwords provides functions to manipulate strings according to the word parsing rules of the UNIX Bourne shell. It is based on [the Ruby module of the same name](http://www.ruby-doc.org/stdlib-1.9.3/libdoc/shellwords/rdoc/Shellwords.html).
-
-## Installation
-
-Add "shellwords" to your `package.json` file and run `npm install`.
-
-## Example
-
-``` javascript
-var shellwords = require("shellwords");
-
-shellwords.split("foo 'bar baz'");
-// ["foo", "bar baz"]
-
-shellwords.escape("What's up, yo?");
-// 'What\\\'s\\ up,\\ yo\\?'
-```
--- a/node_modules/shellwords/lib/shellwords.js
+++ b/node_modules/shellwords/lib/shellwords.js
@ -1,57 +0,0 @@
-// Generated by CoffeeScript 1.3.3
-(function() {
-  var scan;
-
-  scan = function(string, pattern, callback) {
-    var match, result;
-    result = "";
-    while (string.length > 0) {
-      match = string.match(pattern);
-      if (match) {
-        result += string.slice(0, match.index);
-        result += callback(match);
-        string = string.slice(match.index + match[0].length);
-      } else {
-        result += string;
-        string = "";
-      }
-    }
-    return result;
-  };
-
-  exports.split = function(line) {
-    var field, words;
-    if (line == null) {
-      line = "";
-    }
-    words = [];
-    field = "";
-    scan(line, /\s*(?:([^\s\\\'\"]+)|'((?:[^\'\\]|\\.)*)'|"((?:[^\"\\]|\\.)*)"|(\\.?)|(\S))(\s|$)?/, function(match) {
-      var dq, escape, garbage, raw, seperator, sq, word;
-      raw = match[0], word = match[1], sq = match[2], dq = match[3], escape = match[4], garbage = match[5], seperator = match[6];
-      if (garbage != null) {
-        throw new Error("Unmatched quote");
-      }
-      field += word || (sq || dq || escape).replace(/\\(?=.)/, "");
-      if (seperator != null) {
-        words.push(field);
-        return field = "";
-      }
-    });
-    if (field) {
-      words.push(field);
-    }
-    return words;
-  };
-
-  exports.escape = function(str) {
-    if (str == null) {
-      str = "";
-    }
-    if (str == null) {
-      return "''";
-    }
-    return str.replace(/([^A-Za-z0-9_\-.,:\/@\n])/g, "\\$1").replace(/\n/g, "'\n'");
-  };
-
-}).call(this);
--- a/node_modules/shellwords/package.json
+++ b/node_modules/shellwords/package.json
@ -1,56 +0,0 @@
-{
-  "_from": "shellwords@^0.1.1",
-  "_id": "shellwords@0.1.1",
-  "_inBundle": false,
-  "_integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-  "_location": "/shellwords",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "shellwords@^0.1.1",
-    "name": "shellwords",
-    "escapedName": "shellwords",
-    "rawSpec": "^0.1.1",
-    "saveSpec": null,
-    "fetchSpec": "^0.1.1"
-  },
-  "_requiredBy": [
-    "/node-notifier"
-  ],
-  "_resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-  "_shasum": "d6b9181c1a48d397324c84871efbcfc73fc0654b",
-  "_spec": "shellwords@^0.1.1",
-  "_where": "C:\\Users\\ryuki\\TheDesk\\node_modules\\node-notifier",
-  "author": {
-    "name": "Jimmy Cuadra",
-    "email": "jimmy@jimmycuadra.com",
-    "url": "http://jimmycuadra.com/"
-  },
-  "bugs": {
-    "url": "https://github.com/jimmycuadra/shellwords/issues"
-  },
-  "bundleDependencies": false,
-  "dependencies": {},
-  "deprecated": false,
-  "description": "Manipulate strings according to the word parsing rules of the UNIX Bourne shell.",
-  "devDependencies": {
-    "jasmine-node": "~1.0.26",
-    "nodewatch": "~0.1.0"
-  },
-  "files": [
-    "lib"
-  ],
-  "homepage": "https://github.com/jimmycuadra/shellwords",
-  "license": "MIT",
-  "main": "./lib/shellwords",
-  "name": "shellwords",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/jimmycuadra/shellwords.git"
-  },
-  "scripts": {
-    "test": "cake spec"
-  },
-  "version": "0.1.1"
-}
--- a/node_modules/which/CHANGELOG.md
+++ b/node_modules/which/CHANGELOG.md
@ -1,147 +0,0 @@
-# Changes
-
-
-## v1.3.0
-
-* Add nothrow option to which.sync
-* update tap
-
-## v1.2.14
-
-* appveyor: drop node 5 and 0.x
-* travis-ci: add node 6, drop 0.x
-
-## v1.2.13
-
-* test: Pass missing option to pass on windows
-* update tap
-* update isexe to 2.0.0
-* neveragain.tech pledge request
-
-## v1.2.12
-
-* Removed unused require
-
-## v1.2.11
-
-* Prevent changelog script from being included in package
-
-## v1.2.10
-
-* Use env.PATH only, not env.Path
-
-## v1.2.9
-
-* fix for paths starting with ../
-* Remove unused `is-absolute` module
-
-## v1.2.8
-
-* bullet items in changelog that contain (but don't start with) #
-
-## v1.2.7
-
-* strip 'update changelog' changelog entries out of changelog
-
-## v1.2.6
-
-* make the changelog bulleted
-
-## v1.2.5
-
-* make a changelog, and keep it up to date
-* don't include tests in package
-* Properly handle relative-path executables
-* appveyor
-* Attach error code to Not Found error
-* Make tests pass on Windows
-
-## v1.2.4
-
-* Fix typo
-
-## v1.2.3
-
-* update isexe, fix regression in pathExt handling
-
-## v1.2.2
-
-* update deps, use isexe module, test windows
-
-## v1.2.1
-
-* Sometimes windows PATH entries are quoted
-* Fixed a bug in the check for group and user mode bits. This bug was introduced during refactoring for supporting strict mode.
-* doc cli
-
-## v1.2.0
-
-* Add support for opt.all and -as cli flags
-* test the bin
-* update travis
-* Allow checking for multiple programs in bin/which
-* tap 2
-
-## v1.1.2
-
-* travis
-* Refactored and fixed undefined error on Windows
-* Support strict mode
-
-## v1.1.1
-
-* test +g exes against secondary groups, if available
-* Use windows exe semantics on cygwin & msys
-* cwd should be first in path on win32, not last
-* Handle lower-case 'env.Path' on Windows
-* Update docs
-* use single-quotes
-
-## v1.1.0
-
-* Add tests, depend on is-absolute
-
-## v1.0.9
-
-* which.js: root is allowed to execute files owned by anyone
-
-## v1.0.8
-
-* don't use graceful-fs
-
-## v1.0.7
-
-* add license to package.json
-
-## v1.0.6
-
-* isc license
-
-## 1.0.5
-
-* Awful typo
-
-## 1.0.4
-
-* Test for path absoluteness properly
-* win: Allow '' as a pathext if cmd has a . in it
-
-## 1.0.3
-
-* Remove references to execPath
-* Make `which.sync()` work on Windows by honoring the PATHEXT variable.
-* Make `isExe()` always return true on Windows.
-* MIT
-
-## 1.0.2
-
-* Only files can be exes
-
-## 1.0.1
-
-* Respect the PATHEXT env for win32 support
-* should 0755 the bin
-* binary
-* guts
-* package
-* 1st
--- a/node_modules/which/LICENSE
+++ b/node_modules/which/LICENSE
@ -1,15 +0,0 @@
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/node_modules/which/README.md
+++ b/node_modules/which/README.md
@ -1,51 +0,0 @@
-# which
-
-Like the unix `which` utility.
-
-Finds the first instance of a specified executable in the PATH
-environment variable.  Does not cache the results, so `hash -r` is not
-needed when the PATH changes.
-
-## USAGE
-
-```javascript
-var which = require('which')
-
-// async usage
-which('node', function (er, resolvedPath) {
-  // er is returned if no "node" is found on the PATH
-  // if it is found, then the absolute path to the exec is returned
-})
-
-// sync usage
-// throws if not found
-var resolved = which.sync('node')
-
-// if nothrow option is used, returns null if not found
-resolved = which.sync('node', {nothrow: true})
-
-// Pass options to override the PATH and PATHEXT environment vars.
-which('node', { path: someOtherPath }, function (er, resolved) {
-  if (er)
-    throw er
-  console.log('found at %j', resolved)
-})
-```
-
-## CLI USAGE
-
-Same as the BSD `which(1)` binary.
-
-```
-usage: which [-as] program ...
-```
-
-## OPTIONS
-
-You may pass an options object as the second argument.
-
- `path`: Use instead of the `PATH` environment variable.
- `pathExt`: Use instead of the `PATHEXT` environment variable.
- `all`: Return all matches, instead of just the first one.  Note that
-  this means the function returns an array of strings instead of a
-  single string.
--- a/node_modules/which/bin/which
+++ b/node_modules/which/bin/which
@ -1,52 +0,0 @@
-#!/usr/bin/env node
-var which = require("../")
-if (process.argv.length < 3)
-  usage()
-
-function usage () {
-  console.error('usage: which [-as] program ...')
-  process.exit(1)
-}
-
-var all = false
-var silent = false
-var dashdash = false
-var args = process.argv.slice(2).filter(function (arg) {
-  if (dashdash || !/^-/.test(arg))
-    return true
-
-  if (arg === '--') {
-    dashdash = true
-    return false
-  }
-
-  var flags = arg.substr(1).split('')
-  for (var f = 0; f < flags.length; f++) {
-    var flag = flags[f]
-    switch (flag) {
-      case 's':
-        silent = true
-        break
-      case 'a':
-        all = true
-        break
-      default:
-        console.error('which: illegal option -- ' + flag)
-        usage()
-    }
-  }
-  return false
-})
-
-process.exit(args.reduce(function (pv, current) {
-  try {
-    var f = which.sync(current, { all: all })
-    if (all)
-      f = f.join('\n')
-    if (!silent)
-      console.log(f)
-    return pv;
-  } catch (e) {
-    return 1;
-  }
-}, 0))
--- a/node_modules/which/package.json
+++ b/node_modules/which/package.json
@ -1,65 +0,0 @@
-{
-  "_from": "which@^1.3.0",
-  "_id": "which@1.3.0",
-  "_inBundle": false,
-  "_integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
-  "_location": "/which",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "which@^1.3.0",
-    "name": "which",
-    "escapedName": "which",
-    "rawSpec": "^1.3.0",
-    "saveSpec": null,
-    "fetchSpec": "^1.3.0"
-  },
-  "_requiredBy": [
-    "/node-notifier"
-  ],
-  "_resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-  "_shasum": "ff04bdfc010ee547d780bec38e1ac1c2777d253a",
-  "_spec": "which@^1.3.0",
-  "_where": "C:\\Users\\ryuki\\TheDesk\\node_modules\\node-notifier",
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me"
-  },
-  "bin": {
-    "which": "./bin/which"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/node-which/issues"
-  },
-  "bundleDependencies": false,
-  "dependencies": {
-    "isexe": "^2.0.0"
-  },
-  "deprecated": false,
-  "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.",
-  "devDependencies": {
-    "mkdirp": "^0.5.0",
-    "rimraf": "^2.3.3",
-    "tap": "^10.7.0"
-  },
-  "files": [
-    "which.js",
-    "bin/which"
-  ],
-  "homepage": "https://github.com/isaacs/node-which#readme",
-  "license": "ISC",
-  "main": "which.js",
-  "name": "which",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/node-which.git"
-  },
-  "scripts": {
-    "changelog": "bash gen-changelog.sh",
-    "postversion": "npm run changelog && git add CHANGELOG.md && git commit -m 'update changelog - '${npm_package_version}",
-    "test": "tap test/*.js --cov"
-  },
-  "version": "1.3.0"
-}
--- a/node_modules/which/which.js
+++ b/node_modules/which/which.js
@ -1,135 +0,0 @@
-module.exports = which
-which.sync = whichSync
-
-var isWindows = process.platform === 'win32' ||
-    process.env.OSTYPE === 'cygwin' ||
-    process.env.OSTYPE === 'msys'
-
-var path = require('path')
-var COLON = isWindows ? ';' : ':'
-var isexe = require('isexe')
-
-function getNotFoundError (cmd) {
-  var er = new Error('not found: ' + cmd)
-  er.code = 'ENOENT'
-
-  return er
-}
-
-function getPathInfo (cmd, opt) {
-  var colon = opt.colon || COLON
-  var pathEnv = opt.path || process.env.PATH || ''
-  var pathExt = ['']
-
-  pathEnv = pathEnv.split(colon)
-
-  var pathExtExe = ''
-  if (isWindows) {
-    pathEnv.unshift(process.cwd())
-    pathExtExe = (opt.pathExt || process.env.PATHEXT || '.EXE;.CMD;.BAT;.COM')
-    pathExt = pathExtExe.split(colon)
-
-
-    // Always test the cmd itself first.  isexe will check to make sure
-    // it's found in the pathExt set.
-    if (cmd.indexOf('.') !== -1 && pathExt[0] !== '')
-      pathExt.unshift('')
-  }
-
-  // If it has a slash, then we don't bother searching the pathenv.
-  // just check the file itself, and that's it.
-  if (cmd.match(/\//) || isWindows && cmd.match(/\\/))
-    pathEnv = ['']
-
-  return {
-    env: pathEnv,
-    ext: pathExt,
-    extExe: pathExtExe
-  }
-}
-
-function which (cmd, opt, cb) {
-  if (typeof opt === 'function') {
-    cb = opt
-    opt = {}
-  }
-
-  var info = getPathInfo(cmd, opt)
-  var pathEnv = info.env
-  var pathExt = info.ext
-  var pathExtExe = info.extExe
-  var found = []
-
-  ;(function F (i, l) {
-    if (i === l) {
-      if (opt.all && found.length)
-        return cb(null, found)
-      else
-        return cb(getNotFoundError(cmd))
-    }
-
-    var pathPart = pathEnv[i]
-    if (pathPart.charAt(0) === '"' && pathPart.slice(-1) === '"')
-      pathPart = pathPart.slice(1, -1)
-
-    var p = path.join(pathPart, cmd)
-    if (!pathPart && (/^\.[\\\/]/).test(cmd)) {
-      p = cmd.slice(0, 2) + p
-    }
-    ;(function E (ii, ll) {
-      if (ii === ll) return F(i + 1, l)
-      var ext = pathExt[ii]
-      isexe(p + ext, { pathExt: pathExtExe }, function (er, is) {
-        if (!er && is) {
-          if (opt.all)
-            found.push(p + ext)
-          else
-            return cb(null, p + ext)
-        }
-        return E(ii + 1, ll)
-      })
-    })(0, pathExt.length)
-  })(0, pathEnv.length)
-}
-
-function whichSync (cmd, opt) {
-  opt = opt || {}
-
-  var info = getPathInfo(cmd, opt)
-  var pathEnv = info.env
-  var pathExt = info.ext
-  var pathExtExe = info.extExe
-  var found = []
-
-  for (var i = 0, l = pathEnv.length; i < l; i ++) {
-    var pathPart = pathEnv[i]
-    if (pathPart.charAt(0) === '"' && pathPart.slice(-1) === '"')
-      pathPart = pathPart.slice(1, -1)
-
-    var p = path.join(pathPart, cmd)
-    if (!pathPart && /^\.[\\\/]/.test(cmd)) {
-      p = cmd.slice(0, 2) + p
-    }
-    for (var j = 0, ll = pathExt.length; j < ll; j ++) {
-      var cur = p + pathExt[j]
-      var is
-      try {
-        is = isexe.sync(cur, { pathExt: pathExtExe })
-        if (is) {
-          if (opt.all)
-            found.push(cur)
-          else
-            return cur
-        }
-      } catch (ex) {}
-    }
-  }
-
-  if (opt.all && found.length)
-    return found
-
-  if (opt.nothrow)
-    return null
-
-  throw getNotFoundError(cmd)
-}
--- a/package-lock.json
+++ b/package-lock.json
@ -2,16 +2,204 @@
  "requires": true,
  "lockfileVersion": 1,
  "dependencies": {
+    "ansi-escapes": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="
+    },
+    "ansi-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+    },
+    "ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "requires": {
+        "color-convert": "1.9.1"
+      }
+    },
+    "chalk": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+      "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+      "requires": {
+        "ansi-styles": "3.2.1",
+        "escape-string-regexp": "1.0.5",
+        "supports-color": "5.4.0"
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "requires": {
+        "restore-cursor": "2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
+    "color-convert": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
+      "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "requires": {
+        "chardet": "0.4.2",
+        "iconv-lite": "0.4.23",
+        "tmp": "0.0.33"
+      }
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "1.0.5"
+      }
+    },
    "growly": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
+    },
+    "inquirer": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz",
+      "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==",
+      "requires": {
+        "ansi-escapes": "3.1.0",
+        "chalk": "2.4.1",
+        "cli-cursor": "2.1.0",
+        "cli-width": "2.2.0",
+        "external-editor": "2.2.0",
+        "figures": "2.0.0",
+        "lodash": "4.17.10",
+        "mute-stream": "0.0.7",
+        "run-async": "2.3.0",
+        "rxjs": "5.5.11",
+        "string-width": "2.1.1",
+        "strip-ansi": "4.0.0",
+        "through": "2.3.8"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
    "isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
    },
+    "lodash": {
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "node-fetch": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz",
+      "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U="
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "requires": {
+        "mimic-fn": "1.2.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "2.0.1",
+        "signal-exit": "3.0.2"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "2.1.0"
+      }
+    },
+    "rxjs": {
+      "version": "5.5.11",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.11.tgz",
+      "integrity": "sha512-3bjO7UwWfA2CV7lmwYMBzj4fQ6Cq+ftHc2MvUe+WMS7wcdJ1LosDWmdjPQanYp2dBRj572p7PeU81JUxHKOcBA==",
+      "requires": {
+        "symbol-observable": "1.0.1"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
    "semver": {
      "version": "5.5.0",
      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
@ -22,6 +210,54 @@
      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "2.0.0",
+        "strip-ansi": "4.0.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+      "requires": {
+        "ansi-regex": "3.0.0"
+      }
+    },
+    "supports-color": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+      "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+      "requires": {
+        "has-flag": "3.0.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+      "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
    "which": {
      "version": "1.3.0",
      "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
--- a/ver.json
+++ b/ver.json
@ -1 +1 @@
-{"warn":"これはGCPにアップして下さい！！","warn2":"これはGCPにアップして下さい！！","warn3":"これはGCPにアップして下さい！！","desk":"Mio (ver.5)","date":"2018-05-26","detail":"内部V:15.5.0|絵文字拡充ほか"}
+{"warn":"これはGCPにアップして下さい！！","warn2":"これはGCPにアップして下さい！！","warn3":"これはGCPにアップして下さい！！","desk":"Mio (15.6.0)","date":"2018-06-12","detail":"機能たくさん。アプデ後のアプリ内リリースノートなどで。"}