From 7df51c161bcfe26b1babc428a379535c9673213b Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Sat, 13 Apr 2019 03:55:05 +0900
Subject: [PATCH 1/5] mac 18.2.2

---
 app/package.json       | 2 +-
 app/view/en/index.html | 2 +-
 app/view/ja/index.html | 2 +-
 app/view/ps/index.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/package.json b/app/package.json
index 0edca0d9..5a65ff13 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.2.1",
+  "version": "18.2.2",
   "description": "TheDesk is a Mastodon client for PC.",
   "main": "main.js",
   "scripts": {
diff --git a/app/view/en/index.html b/app/view/en/index.html
index c90ba9ad..269ffb26 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.2.1)";
+var ver="Usamin (18.2.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
diff --git a/app/view/ja/index.html b/app/view/ja/index.html
index 828f1943..69fbe14d 100644
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.2.1)";
+var ver="Usamin (18.2.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";
diff --git a/app/view/ps/index.html b/app/view/ps/index.html
index 05df7907..9a295838 100644
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -32,7 +32,7 @@
 <script type="text/javascript" src="../../js/common/modal.js"></script>
 <script type="text/javascript" src="../../js/ui/jquery-ui.min.js"></script>
 <script>
-var ver="Usamin (18.2.1)";
+var ver="Usamin (18.2.2)";
 //betaを入れるとバージョンチェックしない
 //GitHubに上げるときはindex.htmlをちゃんとする。(index.start.html)
 //var ver="beta";

From f88ed31e381968fe8d7c07bf3a2c093bdf0e1705 Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Sat, 13 Apr 2019 12:41:58 +0900
Subject: [PATCH 2/5] Add keybase

---
 app/js/tl/dm.js                 |  4 ++--
 app/js/tl/misskeyparse.js       | 26 +++++++++++++-------------
 app/js/tl/parse.js              | 26 +++++++++++++-------------
 app/js/tl/poll.js               |  2 +-
 app/js/ui/layout.js             | 14 +++++++-------
 app/js/userdata/his-data.js     | 30 ++++++++++++++++++++++++++++++
 app/js/userdata/showOnTL.js     |  3 +++
 app/view/en/index.html          | 25 +++++++++++++------------
 app/view/ja/index.html          | 25 +++++++++++++------------
 app/view/make/index.sample.html | 25 +++++++++++++------------
 app/view/ps/index.html          | 25 +++++++++++++------------
 11 files changed, 121 insertions(+), 84 deletions(-)

diff --git a/app/js/tl/dm.js b/app/js/tl/dm.js
index 6732860a..c434c1ef 100644
--- a/app/js/tl/dm.js
+++ b/app/js/tl/dm.js
@@ -243,7 +243,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
         var id = toot.id;
         var home = "";
 		if (toot.account.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
@@ -506,7 +506,7 @@ function dmListParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.account.acct + locked + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
 			toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock-o"></i>' +
 			date(toot.created_at, datetype) + '</span>' +
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="' +
diff --git a/app/js/tl/misskeyparse.js b/app/js/tl/misskeyparse.js
index c8d6ca2d..0186f7f9 100644
--- a/app/js/tl/misskeyparse.js
+++ b/app/js/tl/misskeyparse.js
@@ -182,14 +182,14 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'"></a>';
 			if (toot.type == "reply") {
 				var what = lang.lang_parse_mentioned;
-				var icon = '<i class="big-text fa fa-share teal-text"></i>';
+				var icon = '<i class="big-text fas fa-share teal-text"></i>';
 				noticeavatar="";
 			} else if (toot.type == "renote") {
 				var what = lang.lang_misskeyparse_renoted;
-				var icon = '<i class="big-text fa fa-retweet light-blue-text"></i>';
+				var icon = '<i class="big-text fas fa-retweet light-blue-text"></i>';
 			}  else if (toot.type == "quote") {
 				var what = lang.lang_misskeyparse_quoted;
-				var icon = '<i class="big-text fa fa-quote-right orange-text"></i>';
+				var icon = '<i class="big-text fas fa-quote-right orange-text"></i>';
 			} else if (toot.type == "reaction") {
 				var what = lang.lang_misskeyparse_reacted;
 				var reactions={
@@ -224,7 +224,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				var icon = '<i class="big-text material-icons indigo-text" style="font-size:17px">info</i>';
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.createdAt,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 				datetype) +
 			'</span>'+icon+'<a onclick="udg(\'' + toot.user.username +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
@@ -290,7 +290,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			if (toot.renote) {
 				var rebtxt = lang.lang_parse_btedsimple;
 				var rticon = "fa-retweet light-blue-text";
-				var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username +
+				var notice = '<i class="big-text fas '+rticon+'"></i>'+ dis_name + "(@" + toot.user.username +
 					")<br>";
 					var boostback = "shared";
 				var uniqueid=toot.id;
@@ -777,7 +777,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			toot.user.username + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'https://' +domain+"/notes/"+
 			toot.id + '\');" title="' + date(toot.createdAt, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock"></i>' +
 			date(toot.createdAt, datetype) + '</span>' +
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="toot ' + spoiler + '">' + content +
@@ -814,23 +814,23 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="misskeyreply(\'' + toot.id +
 			'\',\'' + acct_id + '\',' +
 			acct_id + ',\''+visen+
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fas fa-share"></i></a></div>' +
 			'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="renote(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renote+'"><i class="text-darken-3 fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct"></span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+'"><a onclick="renoteqt(\'' + toot.id + '\',' + acct_id +
-			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			',\'misskey.xyz\',\'misskey.xyz\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_renoteqt+'"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
 			'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="reactiontoggle(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fa text-darken-3 fa-plus' +
+			'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_misskeyparse_reaction+'"><i class="fas text-darken-3 fa-plus' +
 			if_fav + ' fav_' + toot.id + '"></i></div>' +
 			'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fas fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + '"></i></a></div>' 
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fas fa-map-pin pin_' + toot.id + '"></i></a></div>' 
 			+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
@@ -867,7 +867,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		var ftxt=lang.lang_parse_followed;
 		if(popup > 0 || popup==-1){
 			var notftext='<span class="cbadge"title="' + date(toot.createdAt,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.createdAt,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.createdAt,
 				datetype) +
 			'</span>'+ftxt+'<br>';
 			var toot = toot.user;
diff --git a/app/js/tl/parse.js b/app/js/tl/parse.js
index 09655679..54e73beb 100644
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@@ -236,9 +236,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var icon = "fa-tasks  purple-text";
 			}
 			var noticetext = '<span class="cbadge cbadge-hover"title="' + date(toot.created_at,
-				'absolute') + '('+lang.lang_parse_notftime+')"><i class="fa fa-clock-o"></i>' + date(toot.created_at,
+				'absolute') + '('+lang.lang_parse_notftime+')"><i class="far fa-clock"></i>' + date(toot.created_at,
 				datetype) +
-			'</span><i class="big-text fa '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
+			'</span><i class="big-text fas '+icon+'"></i><a onclick="udg(\'' + toot.account.id +
 				'\',\'' + acct_id + '\')" class="pointer grey-text">' + dis_name +
 				"(@" + toot.account.acct +
 				")</a>";
@@ -334,7 +334,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}else if(localStorage.getItem("domain_" + acct_id)=="mstdn.osaka" && !locale){
 					rebtxt = "がしばいた";
 				}
-				var notice = '<i class="big-text fa '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
+				var notice = '<i class="big-text fas '+rticon+'"></i>'+ dis_name + "(@" + toot.account.acct +
 					")<br>";
 					var boostback = "shared";
 				var uniqueid=toot.id;
@@ -387,7 +387,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var divider = '<div class="divider"></div>';
 		}
 		if (toot.account.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
@@ -735,7 +735,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+escapeHTML(choice.title)+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
 			});
 			poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
-			'"><i class="fa fa-calendar-times-o"></i>' +
+			'"><i class="far fa-calendar-times"></i>' +
 			 ended+ '</span></div>';
 		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
@@ -755,7 +755,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			toot.account.acct + locked + '</span></div>' +
 			'<div class="flex-time"><span class="cbadge cbadge-hover pointer waves-effect" onclick="tootUriCopy(\'' +
 			toot.url + '\');" title="' + date(toot.created_at, 'absolute') +
-			'('+lang.lang_parse_clickcopyurl+')"><i class="fa fa-clock-o"></i>' +
+			'('+lang.lang_parse_clickcopyurl+')"><i class="far fa-clock"></i>' +
 			date(toot.created_at, datetype) + '</span>' +
 			'</div></div>' +
 			'<div class="area-toot">'+tickerdom+'<span class="' +
@@ -774,27 +774,27 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			'<div class="action '+disp["re"]+' '+noauth+'"><a onclick="re(\'' + toot.id +
 			'\',\'' + to_mention + '\',' +
 			acct_id + ',\''+visen+
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fa fa-share"></i><span class="rep_ct">' + replyct +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_replyto+'"><i class="fas fa-share"></i><span class="rep_ct">' + replyct +
 			'</a></span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["rt"]+' '+noauth+'"><a onclick="rt(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fa fa-retweet ' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_bt+'"><i class="fas fa-retweet ' +
 			if_rt + ' rt_' + toot.id + '"></i><span class="rt_ct">' + toot.reblogs_count +
 			'</span></a></div>' +
 			'<div class="action '+can_rt+' '+disp["qt"]+' '+noauth+' '+qtClass+'"><a onclick="qt(\'' + toot.id + '\',' + acct_id +
 			',\'' + toot.account.acct +'\',\''+toot.url+
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fa fa-quote-right"></i></a></div>' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_quote+'"><i class="text-darken-3 fas fa-quote-right"></i></a></div>' +
 			'<div class="action '+disp["fav"]+' '+noauth+'"><a onclick="fav(\'' + toot.id + '\',' + acct_id +
 			',\'' + tlid +
-			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fa text-darken-3 fa-star' +
+			'\')" class="waves-effect waves-dark btn-flat actct" style="padding:0" title="'+lang.lang_parse_fav+'"><i class="fas text-darken-3 fa-star' +
 			if_fav + ' fav_' + toot.id + '"></i><span class="fav_ct">' + toot.favourites_count +
 			'</a></span></div>' +
 			'<div class="' + if_mine + ' action '+disp["del"]+' '+noauth+'"><a onclick="del(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="fa fa-trash-o"></i></a></div>' +
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_del+'"><i class="far fa-trash"></i></a></div>' +
 			'<div class="' + if_mine + ' action pin '+disp["pin"]+' '+noauth+'"><a onclick="pin(\'' + toot.id + '\',' +
 			acct_id +
-			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fa fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
+			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_pin+'"><i class="fas fa-map-pin pin_' + toot.id + ' '+if_pin+'"></i></a></div>' 
 			+'<div class="' + if_mine + ' action '+disp["red"]+' '+noauth+'"><a onclick="redraft(\'' + toot.id + '\',' +
 			acct_id +
 			')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_redraft+'"><i class="material-icons">redo</i></a></div>'+trans+
@@ -833,7 +833,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			var notf=false;
 		}
 		if (toot.locked) {
-			var locked = ' <i class="fa fa-lock red-text"></i>';
+			var locked = ' <i class="fas fa-lock red-text"></i>';
 		} else {
 			var locked = "";
 		}
diff --git a/app/js/tl/poll.js b/app/js/tl/poll.js
index 31daec0e..394579d2 100644
--- a/app/js/tl/poll.js
+++ b/app/js/tl/poll.js
@@ -111,7 +111,7 @@ function voteMastodonrefresh(acct_id,id){
 				poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+json.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
 			});
 			poll=poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
-			'"><i class="fa fa-calendar-times-o"></i>' +
+			'"><i class="far fa-calendar-times"></i>' +
             date(json.expires_at, datetype) + '</span>';
             $('.vote_'+acct_id+'_'+json.id).html(poll)
 		}
diff --git a/app/js/ui/layout.js b/app/js/ui/layout.js
index 389117f1..59a0a1b0 100644
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@@ -153,15 +153,15 @@ function parseColumn() {
 			var animecss="";
 		}
 		if(acct.type=="notf"){
-			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fa fa-share exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fa fa-star exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fa fa-retweet exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fa fa-users exc-icons"></i></label> '+
-			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fa fa-tasks exc-icons"></i></label> '+
+			var exclude=lang.lang_excluded+':<br><input type="checkbox" class="filled-in" id="exc-reply-'+key+'" '+excludeCk(key,"mention")+' /><label for="exc-reply-'+key+'" class="exc-chb"><i class="fas fa-share exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-fav-'+key+'"  '+excludeCk(key,"favourite")+' /><label for="exc-fav-'+key+'" class="exc-chb"><i class="fas fa-star exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-bt-'+key+'" '+excludeCk(key,"reblog")+' /><label for="exc-bt-'+key+'" class="exc-chb" ><i class="fas fa-retweet exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"follow")+' /><label for="exc-follow-'+key+'" class="exc-chb" ><i class="fas fa-users exc-icons"></i></label> '+
+			'<input type="checkbox" class="filled-in" id="exc-follow-'+key+'" '+excludeCk(key,"poll")+' /><label for="exc-poll-'+key+'" class="exc-chb" ><i class="fas fa-tasks exc-icons"></i></label> '+
 			'<button class="btn waves-effect" style="width:60px; padding:0;" onclick="exclude('+key+')">Filter</button><br>';
 		}else if(acct.type=="home"){
 			var exclude='<a onclick="ebtToggle(' + key +
-			')" class="setting nex"><i class="fa fa-retweet waves-effect nex" title="'+lang.lang_layout_excludingbt +'" style="font-size:24px"></i><span id="sta-bt-' +
+			')" class="setting nex"><i class="fas fa-retweet waves-effect nex" title="'+lang.lang_layout_excludingbt +'" style="font-size:24px"></i><span id="sta-bt-' +
 			key + '">Off</span></a>'+lang.lang_layout_excludingbt+'<br>';
 		}else{
 			var exclude="";
@@ -445,7 +445,7 @@ function coloradd(key,bg,txt){
 function webviewParse(url,key,insert,icnsert,css){
 	var html = '<div class="box" id="timeline_box_' + key + '_box" tlid="' + key +
 			'" style="'+css+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+'">'+
-			'<div class="area-notice"><i class="fa fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
+			'<div class="area-notice"><i class="fab fa-twitter waves-effect" id="notice_icon_' + key + '" style="font-size:40px; padding-top:25%;"></i></div>'+
 			'<div class="area-notice_name tl-title">WebView('+url+')</div>'+
 			'<div class="area-sta"><input type="checkbox" id="webviewsel" value="true" class="filled-in"><label for="webviewsel">'+lang.lang_layout_webviewmode +'</label></div>'+
 			'<div class="area-a2"><a onclick="removeColumn(' + key +
diff --git a/app/js/userdata/his-data.js b/app/js/userdata/his-data.js
index 8ab213b0..6f596d4d 100644
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -553,6 +553,36 @@ function showFrl(more, acct_id) {
 
 	});
 }
+//Keybase
+function udAdd(start) {
+	fetch(start, {
+		method: 'GET',
+		headers: {
+			'Accept': 'application/json'
+		},
+		//body: JSON.stringify({})
+	}).then(function(response) {
+		return response.json();
+	}).catch(function(error) {
+		todo(error);
+		console.error(error);
+	}).then(function(json) {
+		var fields=json.attachment;
+		for(var i=0;i<fields.length;i++){
+			if(fields[i].type=="IdentityProof"){
+				if(fields[i].signatureAlgorithm=="keybase"){
+					var html='<a href="https://keybase.io/'+fields[i].name+'" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</a>';
+				}else{
+					var html='<span class="cbadge teal" style="max-width:200px;"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</span>';
+				}
+				$("#his-proof-prof").append(html)
+			}
+		}
+	});
+
+	
+}
+
 
 //ユーザーマッチングリスト
 function showMat() {
diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js
index 7c70667b..f0e0d929 100644
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -200,6 +200,8 @@ function udg(user, acct_id) {
 				$(".only-his-data").show();
 			}
 		todc();
+		//外部データ取得(死かもしれないので)
+		udAdd(json.url);
 	});
 }
 function misskeyUdg(user, acct_id) {
@@ -468,6 +470,7 @@ function reset(){
 	$("#his-openin").attr("data-href", "");
 	$("#his-float-timeline").show();
 	$("#his-float-blocked").hide();
+	$("#his-proof-prof").html("")
 }
 $('#my-data-nav .custom-tab').on('click',function(){
 	var target=$(this).find("a").attr("go");
diff --git a/app/view/en/index.html b/app/view/en/index.html
index 269ffb26..223e785b 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	<!--
@@ -249,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -324,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>People who boosted it
+		<i class="text-darken-3 false fas fa-retweet"></i>People who boosted it
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	Use other account(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>:unfav and unBT are disabled.)<br>
+	Use other account(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>:unfav and unBT are disabled.)<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -383,6 +383,7 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
 			<div id="his-des"></div><br>
 			<div id="his-plus-action">
@@ -829,7 +830,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>
diff --git a/app/view/ja/index.html b/app/view/ja/index.html
index 69fbe14d..d86b3089 100644
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	<!--
@@ -249,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -324,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>このトゥートをブーストした人
+		<i class="text-darken-3 false fas fa-retweet"></i>このトゥートをブーストした人
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	他のアカウントを使用(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>の解除はできません)<br>
+	他のアカウントを使用(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>の解除はできません)<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -383,6 +383,7 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
 			<div id="his-des"></div><br>
 			<div id="his-plus-action">
@@ -829,7 +830,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index bb29588e..08cee3cd 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	{{comment-start}}
@@ -249,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -324,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>{{btedPeople}}
+		<i class="text-darken-3 false fas fa-retweet"></i>{{btedPeople}}
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	{{useOtherAcct1}}(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>{{useOtherAcct2}})<br>
+	{{useOtherAcct1}}(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>{{useOtherAcct2}})<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -383,6 +383,7 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
 			<div id="his-des"></div><br>
 			<div id="his-plus-action">
@@ -829,7 +830,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>
diff --git a/app/view/ps/index.html b/app/view/ps/index.html
index 9a295838..b4018420 100644
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -4,13 +4,13 @@
 	<title>TheDesk</title>
 	<meta content="width=device-width,initial-scale=1.0" name="viewport">
 	<link href="../../css/materialize.css" type="text/css" rel="stylesheet">
-	<link href='../../css/font-awesome.css' rel='stylesheet' type='text/css'>
+	<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
 	<link href="../../css/themes.css" type="text/css" rel="stylesheet">
-	<link href='../../css/tl.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/userdata.css' rel='stylesheet' type='text/css'>
-	<link href='../../css/post.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/tl.css" rel="stylesheet" type="text/css">
+	<link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+	<link href="../../css/post.css" rel="stylesheet" type="text/css">
 	<link href="../../css/master.css" type="text/css" rel="stylesheet">
-	<link href='../../css/sort.css' rel='stylesheet' type='text/css'>
+	<link href="../../css/sort.css" rel="stylesheet" type="text/css">
 	<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Open+Sans:300|Baloo+Bhai" rel="stylesheet">
 	<meta charset="utf-8">
 	
@@ -249,7 +249,7 @@ var tlid=0;
 			<i class="material-icons">flag</i>
 			</a>
 			<a onclick="faicon()" class="pointer waves-effect" title="faicon" id="faicon-btn">
-			<i class="fa fa-fort-awesome"></i>
+			<i class="fab fa-fort-awesome"></i>
 			</a>
 		</div>
 	</div>
@@ -324,26 +324,26 @@ var tlid=0;
 	</li>
 	<li class="dm-hide">
 		<div class="collapsible-header">
-		<i class="text-darken-3 fa fa-retweet"></i>crwdns429:0crwdne429:0
+		<i class="text-darken-3 false fas fa-retweet"></i>crwdns429:0crwdne429:0
 		</div>
 		<div class="collapsible-body toot-reset" id="toot-rt">
 		</div>
 	</li>
 	</ul>
 	<div class="dm-hide">
-	crwdns430:0crwdne430:0(<i class="fa fa-retweet"></i>/<i class="fa fa-star"></i>crwdns431:0crwdne431:0)<br>
+	crwdns430:0crwdne430:0(<i class="fas fa-retweet"></i>/<i class="fas fa-star"></i>crwdns431:0crwdne431:0)<br>
 	<div class="row">
 		<div class="col s6">
 				<select id="status-acct-sel" class="acct-sel"></select>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fa fa-share"></i>/button>
+			<button class="dropdown-button btn waves-effect" style="width:100%;" onclick="staEx('reply')"><i class="fas fa-share"></i>/button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fa fa-retweet"></i></button>
+			<button class="dropdown-button btn waves-effect indigo" style="width:100%;" onclick="staEx('rt')"><i class="fas fa-retweet"></i></button>
 		</div>
 		<div class="col s2">
-			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fa fa-star"></i></button>
+			<button class="dropdown-button btn waves-effect orange" style="width:100%;" onclick="staEx('fav')"><i class="fas fa-star"></i></button>
 		</div>
 	</div>
 	<div id="toot-tools">
@@ -383,6 +383,7 @@ var tlid=0;
 			<span class="cbadge" style="max-width:150px; width:150px; ">Since:
 			<span id="his-since"></span>
 			</span>
+			<div id="his-proof-prof"></div>
 			</div>
 			<div id="his-des"></div><br>
 			<div id="his-plus-action">
@@ -829,7 +830,7 @@ var tlid=0;
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 				</a>
 				<a onclick="tips('spotify')" class="nex waves-effect">
-					<i class="fa fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
+					<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 				</a>
 			</div>
 		</div>

From 4e5fe2fc91fb5db848285be552868ec811f14856 Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Sat, 13 Apr 2019 12:51:54 +0900
Subject: [PATCH 3/5] proof lang

---
 app/js/lang/lang.en.js      | 1 +
 app/js/lang/lang.ja.js      | 1 +
 app/js/userdata/his-data.js | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/js/lang/lang.en.js b/app/js/lang/lang.en.js
index 4bb2b0da..bab2f536 100644
--- a/app/js/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@@ -141,6 +141,7 @@ var lang={
     "lang_hisdata_frcwarn":"Unfollow accounts will be shown.",
     "lang_hisdata_taketime":"It will take 30s ~ several minutes",
     "lang_hisdata_notonmisskey":"Misskey is unable to request.",
+    "lang_hisdata_key":"This user is proofed by {{set}}",
     //userdata/showOnTL.js
     "lang_showontl_movetxt":"This account was moved",
     "lang_showontl_movebtn":"Continue on the new account",
diff --git a/app/js/lang/lang.ja.js b/app/js/lang/lang.ja.js
index 5930feef..2860f8b4 100644
--- a/app/js/lang/lang.ja.js
+++ b/app/js/lang/lang.ja.js
@@ -143,6 +143,7 @@ var lang={
     "lang_hisdata_frcwarn":"非フォローだけど絡みがある時に表示されます。",
     "lang_hisdata_taketime":"30秒から数分かかります",
     "lang_hisdata_notonmisskey":"このシステムはMisskeyにはありません。",
+    "lang_hisdata_key":"このユーザーの信頼性は{{set}}によって示されています",
 //userdata/showOnTL.js
     "lang_showontl_movetxt":"このアカウントは移行しています",
     "lang_showontl_movebtn":"移行先を見る",
diff --git a/app/js/userdata/his-data.js b/app/js/userdata/his-data.js
index 6f596d4d..851b20cd 100644
--- a/app/js/userdata/his-data.js
+++ b/app/js/userdata/his-data.js
@@ -571,16 +571,16 @@ function udAdd(start) {
 		for(var i=0;i<fields.length;i++){
 			if(fields[i].type=="IdentityProof"){
 				if(fields[i].signatureAlgorithm=="keybase"){
-					var html='<a href="https://keybase.io/'+fields[i].name+'" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</a>';
+					var html='<a href="https://keybase.io/'+fields[i].name+'" target="_blank" class="cbadge teal waves-effect" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",fields[i].signatureAlgorithm)+'"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</a>';
 				}else{
-					var html='<span class="cbadge teal" style="max-width:200px;"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</span>';
+					var html='<span class="cbadge teal" style="max-width:200px;" title="'+lang.lang_hisdata_key.replace("{{set}}",fields[i].signatureAlgorithm)+'"><i class="fas fa-key" aria-hidden="true"></i>'+fields[i].signatureAlgorithm+':'+fields[i].name+'</span>';
 				}
 				$("#his-proof-prof").append(html)
 			}
 		}
 	});
 
-	
+
 }
 
 

From cec46faf19d243b50ed649d12b5f35da1c512bbf Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Sun, 14 Apr 2019 01:42:18 +0900
Subject: [PATCH 4/5] keybase

---
 app/js/platform/end.js          | 7 +++++--
 app/js/platform/first.js        | 7 +++++++
 app/js/tl/card.js               | 7 +++----
 app/js/userdata/showOnTL.js     | 8 ++++++++
 app/view/en/index.html          | 2 +-
 app/view/ja/index.html          | 2 +-
 app/view/make/index.sample.html | 2 +-
 app/view/ps/index.html          | 2 +-
 8 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/app/js/platform/end.js b/app/js/platform/end.js
index 9d18fe07..4e9adaf2 100644
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@@ -35,8 +35,11 @@
 			
 		}else if(tags){
 			if(tags[2]){
-				tagShow(tags[2]);
-				Materialize.toast('<a class="btn-flat toast-action" href="detEx(\''+url+'\')">Open in browser</a>', 86400);
+				var acct_id=$a.parent().attr("data-acct");
+				if(!acct_id){
+					acct_id=0;
+				}
+				tl('tag',decodeURI(tags[2]),acct_id,'add')
 			}
 		}else if(ats){
 			console.log(ats);
diff --git a/app/js/platform/first.js b/app/js/platform/first.js
index 255b6cfc..a95edd06 100644
--- a/app/js/platform/first.js
+++ b/app/js/platform/first.js
@@ -32,6 +32,13 @@ function nl2br(str) {
 	str = str.replace(/(\n|\r)/g, "<br />");
     return str;
 }
+function br2nl(str) {
+	if(!str){
+		return "";
+	}
+    str = str.replace(/<br \/>/g, "\r\n");
+    return str;
+}
 function formattime(date){
 	var str=date.getFullYear()+"-";
 	if(date.getMonth()+1<10){
diff --git a/app/js/tl/card.js b/app/js/tl/card.js
index d9e981f3..b6c1395e 100644
--- a/app/js/tl/card.js
+++ b/app/js/tl/card.js
@@ -4,9 +4,9 @@ function additional(acct_id, tlid) {
 	//メンション系
 	//$(".mention").attr("href", "");
 	
-	$(".mention").addClass("parsed");
+	$("#timeline-container .mention").addClass("parsed");
 
-	$(".hashtag").each(function(i, elem) {
+	$("#timeline-container .hashtag").each(function(i, elem) {
 		var tags = $(this).attr("href").match(
 			/https?:\/\/([-a-zA-Z0-9@.]+)\/tags\/([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)/
 		);
@@ -17,8 +17,6 @@ function additional(acct_id, tlid) {
 			}
 			
 		}
-		
-		
 	});
 	
 	//トゥートサムネ
@@ -34,6 +32,7 @@ function additional(acct_id, tlid) {
 				);
 			}
 		}else{
+			text=""
 			var urls =[]
 		}
 		
diff --git a/app/js/userdata/showOnTL.js b/app/js/userdata/showOnTL.js
index f0e0d929..b201b38b 100644
--- a/app/js/userdata/showOnTL.js
+++ b/app/js/userdata/showOnTL.js
@@ -105,6 +105,7 @@ function udg(user, acct_id) {
 			fer(json.id, '', acct_id);
 			var dis_name=escapeHTML(json.display_name);
 			dis_name=twemoji.parse(dis_name);
+
 			var note=json.note;
 			if(json.emojis){
 				var actemojick = json.emojis[0];
@@ -123,6 +124,12 @@ function udg(user, acct_id) {
 					note = note.replace(regExp, emoji_url);
 				});
 			}
+			//noteの解析
+			//var tags =  '<a onclick="tl(\'tag\',\'$1\',' + acct_id +',\'add\')" class="pointer parsed">#$1</a>';
+			//var mens =  '<a onclick="udgEx(\'$1\',' + acct_id +')" class="pointer parsed">@$1</a>';
+			//note=note.replace(/#(\S+)/gi, tags)
+			console.log(note)
+			//note=note.replace(/\s@([a-zA-Z_0-9@.-]+)/gi, mens)
 			$("#his-name").html(dis_name);
 			$("#his-acct").text(json.acct);
 			$("#his-acct").attr("fullname",fullname);
@@ -164,6 +171,7 @@ function udg(user, acct_id) {
 			if(json.bot){
 				$("#his-bot").html(lang.lang_showontl_botacct);
 			}
+			$("#his-des").attr("data-acct",acct_id);
 			$('#his-data').css('background-size', 'cover');
 			$("#his-data .tab-content").css("height",$("#his-float-timeline").height()-70+"px")
 			localStorage.setItem("history" , user);
diff --git a/app/view/en/index.html b/app/view/en/index.html
index 223e785b..461fbac4 100644
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@@ -385,7 +385,7 @@ var tlid=0;
 			</span>
 			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">Emphasize this user</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">Feature on profile</a><br>
diff --git a/app/view/ja/index.html b/app/view/ja/index.html
index d86b3089..243f55af 100644
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@@ -385,7 +385,7 @@ var tlid=0;
 			</span>
 			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">ユーザー強調</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">紹介する</a><br>
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index 08cee3cd..44901031 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -385,7 +385,7 @@ var tlid=0;
 			</span>
 			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">{{empUser}}</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">{{endorse}}</a><br>
diff --git a/app/view/ps/index.html b/app/view/ps/index.html
index b4018420..05a2849a 100644
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@@ -385,7 +385,7 @@ var tlid=0;
 			</span>
 			<div id="his-proof-prof"></div>
 			</div>
-			<div id="his-des"></div><br>
+			<div id="his-des" data-acct=""></div><br>
 			<div id="his-plus-action">
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat" id="his-emp-btn" onclick="empUser()">crwdns472:0crwdne472:0</a>
 					<a href="#!" class="btn waves-effect waves-effect blue-grey btn-flat only-his-data" id="his-end-btn" onclick="pinUser()">crwdns454:0crwdne454:0</a><br>

From 51e6909f77e2352b2af0daabffb3ff58068acaf9 Mon Sep 17 00:00:00 2001
From: Cutls <web-pro@cutls.com>
Date: Sun, 14 Apr 2019 01:42:49 +0900
Subject: [PATCH 5/5] #64 fix

---
 app/package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/package.json b/app/package.json
index 5a65ff13..c714283e 100644
--- a/app/package.json
+++ b/app/package.json
@@ -2,6 +2,7 @@
   "name": "thedesk",
   "version": "18.2.2",
   "description": "TheDesk is a Mastodon client for PC.",
+  "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",