vote(Mastodon 2.8)

2019-03-06 17:08:48 +09:00 · 2019-03-06 17:08:48 +09:00 · 86d99f40a5
commit 86d99f40a5
parent d5f3354e71
37 changed files with 1622 additions and 575 deletions
--- a/app/css/master.css
+++ b/app/css/master.css
@ -41,12 +41,10 @@ option {
  display: none;
  max-width: 100vw;
  max-height: 100vh;
-  top:0;
-  background-color: var(--modal);
  position: fixed;
  z-index: 9;
 }
-#imagemodal, #videomodal, #tootmodal {
+#videomodal, #tootmodal {
  background-color: var(--modal);
 }
 #imagemodal .modal-content {
@ -56,6 +54,7 @@ option {
  overflow-x:scroll;
  overflow-y:hidden;
 }
+
 #imagewrap {
  width: 100%;
  height: 100%;
@ -269,6 +268,18 @@ blockquote:before, .quote:before {
      opacity: 1;
  }
 }
+.hide-anime{
+  animation: hide 0.2s linear 0s;
+  display:none;
+}
+@keyframes hide{
+  from{
+      opacity: 1;
+  }
+  to{
+      opacity: 0;
+  }
+}
 .collapsible-header,.tabs{
  background-color: var(--subcolor);
 }
--- a/app/css/post.css
+++ b/app/css/post.css
@ -1,23 +1,35 @@
 /*トゥートボックス向けCSS*/
 #post-box {
+  display:none;
  position: fixed;
-  left: 78px;
-  bottom: -500px;
+  left: calc(50vw - 150px);
+  top: 50vh;
  background-color: var(--postbox);
  border: thin solid gray;
  z-index: 501;
-  width: 300px;
  min-width:300px;
  max-width:100%;
  padding: 5px;
 }
+#post-bar{
+  cursor:move;
+  text-align:center;
+  width:calc(100% + 10px);
+  background-color: var(--bg);
+  margin-left:-5px;
+  margin-right:-5px;
+  margin-top:-5px;
+  font-size:16px;
+  padding:4px;
+}
 .cancel {
  font-size: 0.5rem;
  color: gray;
  cursor: pointer;
  position: absolute;
-  width: 60px;
-  right: 0px;
+  right: 2px;
+  top:4px;
+
 }
 .more-show {
  display: none;
@ -51,16 +63,11 @@
  filter: blur(50px);
 }
 #emoji {
-  position: fixed;
-  bottom: 40px;
-  width: 300px;
-  height: 380px;
-  z-index: 502;
-  padding: 5px;
+  
 }
 #emoji-list {
  width: 100%;
-  height: calc(100% - 130px);
+  height: 200px;
  overflow-y: scroll;
 }
 #preview-field {
@ -87,7 +94,25 @@
 #toot-sec-btn{
  width:30px; padding:0; margin-top:10px;
 }
+#left-side{
+  float:left;
+  width:300px;
+}
+#right-side{
+  display:none;
+  float:left;
+  width:300px;
+  padding:5px;
+}
+#poll{
  
+}
+.poll-provider{
+  position: absolute;
+  height: calc(100% - 90px);
+  overflow-y: scroll;
+  top: 90px;
+}

 /*mini*/
 .mini-post .mize{
--- a/app/css/themes.css
+++ b/app/css/themes.css
@ -15,6 +15,9 @@
    --postbox:white;
    --modalfooter:#fafafa;
 }
+#imagemodal{
+    background: url("../img/pixel.white.svg");
+}
 .blacktheme {
    --bg:#212121;
    --drag:rgba(0, 0, 0, 0.8);
@ -32,6 +35,9 @@
    --postbox:#424242;
    --modalfooter:#212121;
 }
+.blacktheme #imagemodal{
+    background: url("../img/pixel.svg");
+}
 .indigotheme {
    --bg:#031833;
    --drag:rgba(0, 0, 0, 0.8);
@ -49,6 +55,9 @@
    --postbox:#1a237e;
    --modalfooter:#031833;
 }
+.indigotheme #imagemodal{
+    background: url("../img/pixel.svg");
+}
 .browntheme {
    --bg:#261411;
    --drag:rgba(0, 0, 0, 0.8);
@ -66,6 +75,9 @@
    --postbox:#4e342e;
    --modalfooter:#261411;
 }
+.browntheme #imagemodal{
+    background: url("../img/pixel.svg");
+}
 .greentheme{
    --bg:#c8e6c9;
    --drag:rgba(255, 255, 255, 0.8);
@ -83,3 +95,6 @@
    --postbox:#a5d6a7;
    --modalfooter:#81c784;
 }
+.greentheme #imagemodal{
+    background: url("../img/pixel.white.svg");
+}
--- a/app/css/tl.css
+++ b/app/css/tl.css
@ -141,6 +141,9 @@ iframe {
 .bt-filter .shared{
  display:none;
 }
+.except-bt-filter .unshared{
+  display:none;
+}
 .cvo {
  user-select: text;
  padding-left: 5px;
@ -463,3 +466,54 @@ p:not(:last-child){
 	overflow-x: hidden;
 	max-height: 200px;
 }
+.votebtn{
+  border: 1px solid;
+  color: var(--color);
+  background-color: var(--modal);
+  cursor:pointer;
+  width: 50px;
+  padding: 2px;
+  display: inline-block;
+  text-align: center;
+  margin-top: 5px;
+  border-radius: 10px;
+  transition-duration: 0.5s;
+}
+.votebtn:hover{
+  background-color:transparent;
+}
+@keyframes fadeInDown {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(0, -100%, 0);
+    transform: translate3d(0, -100%, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+@keyframes fadeInLeft {
+  from {
+    opacity: 0;
+    -webkit-transform: translate3d(-100%, 0, 0);
+    transform: translate3d(-100%, 0, 0);
+  }
+
+  to {
+    opacity: 1;
+    -webkit-transform: translate3d(0, 0, 0);
+    transform: translate3d(0, 0, 0);
+  }
+}
+.box-anime {
+  animation-duration: 1s;
+  animation-name: fadeInLeft;
+}
+
+.cvo-anime {
+  animation-duration: 0.1s;
+  animation-name: fadeInDown;
+}
--- a/app/img/pixel.svg
+++ b/app/img/pixel.svg
@ -0,0 +1,11 @@
+<svg width="300" height="300" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <defs>
+  <pattern id="pp" x="0" y="0" width="30" height="30" patternUnits="userSpaceOnUse">
+   <rect x="0" y="0" width="15" height="15" fill="#616161" />
+   <rect x="0" y="15" width="15" height="15" fill="#000000" />
+   <rect x="15" y="15" width="15" height="15" fill="#616161" />
+   <rect x="15" y="0" width="15" height="15" fill="#000000" />
+  </pattern>
+ </defs>
+<rect width="300" height="300" fill="url(#pp)" />
+</svg>
--- a/app/img/pixel.white.svg
+++ b/app/img/pixel.white.svg
@ -0,0 +1,11 @@
+<svg width="300" height="300" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <defs>
+  <pattern id="pp" x="0" y="0" width="30" height="30" patternUnits="userSpaceOnUse">
+   <rect x="0" y="0" width="15" height="15" fill="#e0e0e0" />
+   <rect x="0" y="15" width="15" height="15" fill="#ffffff" />
+   <rect x="15" y="15" width="15" height="15" fill="#e0e0e0" />
+   <rect x="15" y="0" width="15" height="15" fill="#ffffff" />
+  </pattern>
+ </defs>
+<rect width="300" height="300" fill="url(#pp)" />
+</svg>
--- a/app/js/emoji/default-emoji.js
+++ b/app/js/emoji/default-emoji.js
@ -20,8 +20,7 @@ if(lang=="ja"){
        place:"場所",
        symbol:"記号"
    };
-    var lang_defaultemojis_text="{{cat}}の絵文字";
-}else if(lang=="en"){
+}else{
    var defaultemojiname={
        activity:"Activities",
        flag:"Flags",
@ -32,7 +31,6 @@ if(lang=="ja"){
        place:"Places",
        symbol:"Symbols"
    };
-    var lang_defaultemojis_text="Emojis of {{cat}}";
 }

 function defaultEmoji(target){
@ -43,7 +41,8 @@ function defaultEmoji(target){
        emojis = emojis + '<a onclick="defEmoji(\''+emoji["shortcode"]+'\')" class="pointer"><span style="width: 20px; height: 20px; display: inline-block; background-image: url(\'../../img/sheet.png\'); background-size: 4900%; background-position: '+emoji["css"]+';"></span></a>';
    });
    $("#emoji-list").html(emojis);
-    $("#now-emoji").text(lang_defaultemojis_text.replace("{{cat}}" ,defaultemojiname[target]));
+    $("#now-emoji").text(lang.lang_defaultemojis_text.replace("{{cat}}" ,defaultemojiname[target]));
+    console.log(target);
    $(".emoji-control").addClass("hide");
 }
 function customEmoji(){
--- a/app/js/lang/lang.en.js
+++ b/app/js/lang/lang.en.js
@ -39,6 +39,7 @@ var lang={
    //post/emoji.js
    "lang_emoji_get":"Get emojis",
    "lang_emoji_custom":"Custom emojis",
+    "lang_defaultemojis_text":"Emojis about {{cat}}",
    //post/img.js
    "lang_postimg_previewdis":"cannot preview",
    "lang_postimg_aftupload":"You cannot change accounts after uploading.",
@ -117,7 +118,7 @@ var lang={
    "lang_layout_dm":"Direct Message",
    "lang_layout_webviewmode":"Prefer WebView",
    "lang_excluded":"Excluded type of notification",
-    "lang_layout_excludingbt":"Exclude Boosts",
+    "lang_layout_excludingbt":"Show BT mode(OFF/Exclude BT/Only BT)",
    //ui/spotify.js
    "lang_spotify_img":"Attach an album artwork",
    "lang_spotify_imgno":"Not attach an album artwork",
@ -173,6 +174,9 @@ var lang={
    "lang_parse_clientemp":"emphasized(/not emphasized)",
    "lang_parse_clientmute":"muted",
    "lang_parse_mute":" will be muted. You can remove on preferences.",
+    "lang_parse_voted":"Voted",
+    "lang_parse_vote":"Voted",
+    "lang_parse_unvoted":"Show the result without voting",
    //misskey
    "lang_misskeyparse_renote":"Repost",
    "lang_misskeyparse_renoteqt":"Renote",
@ -210,6 +214,7 @@ var lang={
    "lang_setting_size":"Font size:{{set}}px",
    "lang_setting_imgheight":"Image height:{{set}}px",
    "lang_setting_ticker":"#InstanceTicker:{{set}}px",
+    "lang_setting_animation":"Animation: {{set}}",
    "lang_setting_tag":"Tag TL:{{set}}",
    "lang_setting_boxConfirm":"Post box:{{set}}",
    "lang_setting_ul":"Native locale:{{set}}",
--- a/app/js/lang/lang.ja.js
+++ b/app/js/lang/lang.ja.js
@ -40,6 +40,7 @@ var lang={
 //post/emoji.js
    "lang_emoji_get":"絵文字リストを取得",
    "lang_emoji_custom":"カスタム絵文字",
+    "lang_defaultemojis_text":"{{cat}}の絵文字",
 //post/img.js
    "lang_postimg_previewdis":"プレビューできません。",
    "lang_postimg_aftupload":"アップロード後はアカウントを切り替えられません。",
@ -118,7 +119,7 @@ var lang={
    "lang_layout_dm":"ダイレクトメッセージ",
    "lang_layout_webviewmode":"WebView優先",
    "lang_excluded":"除外する通知",
-    "lang_layout_excludingbt":"ブーストを除外",
+    "lang_layout_excludingbt":"BT表示(OFF/BT除外/BTのみ)",
 //ui/spotify.js
    "lang_spotify_img":"アルバムアートワークを添付します。",
    "lang_spotify_imgno":"アルバムアートワークを添付しません。",
@ -174,6 +175,9 @@ var lang={
    "lang_parse_clientemp":"強調表示/解除",
    "lang_parse_clientmute":"ミュート",
    "lang_parse_mute":"ミュートします。設定から解除できます。",
+    "lang_parse_voted":"投票済みです",
+    "lang_parse_vote":"投票",
+    "lang_parse_unvoted":"結果だけ見る",
    //misskey
    "lang_misskeyparse_renote":"再投稿",
    "lang_misskeyparse_renoteqt":"引用",
@ -211,6 +215,7 @@ var lang={
    "lang_setting_size":"フォントサイズを{{set}}pxに設定しました。",
    "lang_setting_imgheight":"画像高さを{{set}}pxに設定しました。",
    "lang_setting_ticker":"#InstanceTicker使用を{{set}}に設定しました。",
+    "lang_setting_animation":"アニメーションを{{set}}に設定しました。",
    "lang_setting_tag":"タグの取得範囲を「{{set}}」に設定しました。",
    "lang_setting_boxConfirm":"投稿ボックスを{{set}}",
    "lang_setting_ul":"独自ロケール設定を{{set}}に設定しました。",
--- a/app/js/login/login.js
+++ b/app/js/login/login.js
@ -344,7 +344,7 @@ function ckdb(acct_id) {
 	localStorage.removeItem("post_" + acct_id);
 	localStorage.removeItem("fav_" + acct_id);
 	localStorage.removeItem("bt_" + acct_id);
-	localStorage.removeItem("follow_" + acct_id);
+	localStorage.removeItem("followlocale_" + acct_id);
 	if(domain=="kirishima.cloud"){
 		localStorage.setItem("kirishima", "true");
 		$("#ranking-btn").show();
@ -402,7 +402,7 @@ function ckdb(acct_id) {
 				localStorage.setItem("bt_" + acct_id, json[domain + "_bt"]);
 			}
 			if(json[domain + "_follow"]){
-				localStorage.setItem("follow_" + acct_id, json[domain + "_follow"]);
+				localStorage.setItem("followlocale_" + acct_id, json[domain + "_follow"]);
 			}
 	}
 	if(localStorage.getItem("mode_" + domain)!="misskey"){
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@ -11,13 +11,10 @@ function emojiToggle() {
 		selin=0;
 	}
 	localStorage.setItem("cursor", selin);
+
 	if ($("#emoji").hasClass("hide")) {
-		if($("#bottom").hasClass("reverse")){
-			$('#emoji').css("left",$('#post-box').offset().left-295+"px");
-		}else{
-			$('#emoji').css("left",$('#post-box').offset().left+295+"px");
-		}
 		$("#emoji").removeClass("hide")
+		$("#right-side").show()
 		if (!localStorage.getItem("emoji_" + acct_id)) {
 			var html =
 				'<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet(\'true\');">'+lang.lang_emoji_get+'</button>';
@ -26,7 +23,9 @@ function emojiToggle() {
 			emojiList('home');
 		}
 	} else {
+		$("#poll").addClass("hide")
 		$("#emoji").addClass("hide")
+		$("#right-side").hide()
 	}


--- a/app/js/post/post.js
+++ b/app/js/post/post.js
@ -122,12 +122,36 @@ function post(mode,postvis) {
 	}
 	if ($("#sch-box").hasClass("sch-avail")) {
 		var scheduled=formattimeutc(new Date(Date.parse($("#sch-date").val())))
+		console.log(scheduled)
 		schedule();
 		toot.scheduled_at=scheduled;
-		
 	} else {
 		var scheduled = "";
 	}
+	if ($("#poll-sel").val()=="mastodon-poll") {
+		var options=[];
+		$(".mastodon-choice").map(function() {
+			var choice=$(this).val();
+			if(choice!=""){
+				options.push(choice);
+			}
+		});
+		if($("#poll-multiple:checked").val()=="1"){
+			var mul=true;
+		}else{
+			var mul=false;
+		}
+		var exin=pollCalc();
+		if(!exin){
+			todc("Error: Poll expires_in param")
+		}
+		toot.poll={
+			options: options,
+			expires_in: exin,
+			multiple: mul
+		}
+	}
+	console.log(toot);
 	var httpreq = new XMLHttpRequest();
 	httpreq.open('POST', start, true);
 	httpreq.setRequestHeader('Content-Type', 'application/json');
@ -263,6 +287,12 @@ function clear() {
 	$("#preview").html("");
 	$(".toot-btn-group").prop("disabled", false);
 	$("#post-acct-sel").prop("disabled", false);
+	$("#days_poll").val(0);
+  $("#hours_poll").val(0);
+	$("#mins_poll").val(0);
+	$(".mastodon-choice").map(function() {
+		$(this).val("");
+	});
 	localStorage.removeItem("image");
 	if(localStorage.getItem("mainuse")=="main"){
 		$("#post-acct-sel").val(localStorage.getItem("main"));
--- a/app/js/tl/dm.js
+++ b/app/js/tl/dm.js
@ -0,0 +1,543 @@
+//DM(Conv) TL
+function dm(acct_id, tlid, type,delc,voice) {
+
+    var domain = localStorage.getItem("domain_" + acct_id);
+	var at = localStorage.getItem("acct_"+ acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/conversations";
+	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 templete = dmParse(json, type, acct_id, tlid, "", mute);
+        localStorage.setItem("lastobj_"+ tlid,json[0].id)
+        $("#timeline_" + tlid).html(templete);
+	    additional(acct_id, tlid);
+	    jQuery("time.timeago").timeago();
+	    todc();
+	    //reload(type, '', acct_id, tlid, data, mute, delc,voice);
+	    $(window).scrollTop(0);
+    });
+    
+}
+//DMオブジェクトパーサー(トゥート)
+function dmParse(obj, mix, acct_id, tlid, popup, mutefilter) {
+    console.log(obj);
+	var templete = '';
+	if(obj[0]){
+		if(tlid==1){
+			console.log("testalive:"+"lastunix_"+ tlid+":"+date(obj[0].created_at, 'unix'))
+		}
+		localStorage.setItem("lastunix_"+ tlid,date(obj[0].created_at, 'unix'));
+	}
+	
+	var actb = localStorage.getItem("action_btns");
+	var actb='re,rt,fav,qt,del,pin,red';
+	if(actb){
+		var actb = actb.split(',');
+		var disp={};
+		for(var k=0;k<actb.length;k++){
+			if(k<4){
+				var tp="type-a";
+			}else{
+				var tp="type-b";
+			}
+			disp[actb[k]]=tp;
+		}
+	}
+	var datetype = localStorage.getItem("datetype");
+	var nsfwtype = localStorage.getItem("nsfw");
+	var sent = localStorage.getItem("sentence");
+	var ltr = localStorage.getItem("letters");
+	var gif = localStorage.getItem("gif");
+	var imh = localStorage.getItem("img-height");
+	//独自ロケール
+	var locale = localStorage.getItem("locale");
+	if(locale=="yes"){
+		var locale=false;
+	}
+	//ネイティブ通知
+	var native=localStorage.getItem("nativenotf");
+	if(!native){
+		native="yes";
+	}
+	//クライアント強調
+	var emp = localStorage.getItem("client_emp");
+	if(emp){
+		var emp = JSON.parse(emp);
+	}
+	//クライアントミュート
+	var mute = localStorage.getItem("client_mute");
+	if(mute){
+		var mute = JSON.parse(mute);
+	}
+	//ユーザー強調
+	var useremp = localStorage.getItem("user_emp");
+	if(useremp){
+		var useremp = JSON.parse(useremp);
+	}
+	//ワード強調
+	var wordemp = localStorage.getItem("word_emp");
+	if(wordemp){
+		var wordemp = JSON.parse(wordemp);
+	}
+	//ワードミュート
+	var wordmute = localStorage.getItem("word_mute");
+	if(wordmute){
+		var wordmute = JSON.parse(wordmute);
+		wordmute = wordmute.concat(mutefilter);
+	}else{
+		wordmute = mutefilter;
+	}
+	//Ticker
+	var tickerck = localStorage.getItem("ticker_ok");
+	if(tickerck){
+		var ticker=true;
+	}else{
+		var ticker=false;
+	}
+	//Cards
+	var card = localStorage.getItem("card_" + tlid);
+	
+	if (!sent) {
+		var sent = 500;
+	}
+	if (!ltr) {
+		var ltr = 500;
+	}
+	if (!nsfwtype || nsfwtype == "yes") {
+		var nsfw = "ok";
+	} else {
+		var nsfw;
+	}
+	var cwtype = localStorage.getItem("cw");
+	if (!cwtype || cwtype == "yes") {
+		var cw = "ok";
+	} else {
+		var cw;
+	}
+	if (!datetype) {
+		datetype = "absolute";
+	}
+	if (!gif) {
+		var gif = "yes";
+	}
+	if (!imh) {
+		var imh = "200";
+	}
+	if(!emp){
+		var emp=[];
+	}
+	if(!mute){
+		var mute=[];
+	}
+	if(!useremp){
+		var useremp=[];
+	}
+	if(!wordemp){
+		var wordemp=[];
+	}
+	if(!wordmute){
+		var wordmute=[];
+	}
+	//via通知
+	var viashow=localStorage.getItem("viashow");
+	if(!viashow){
+		viashow="via-hide";
+	}
+	if(viashow=="hide"){
+		viashow="via-hide";
+	}
+	//認証なしTL
+	if(mix=="noauth"){
+		var noauth="hide";
+		var antinoauth="";
+	}else{
+		var noauth="";
+		var antinoauth="hide";
+	}
+	//マウスオーバーのみ
+	var mouseover=localStorage.getItem("mouseover");
+	if(!mouseover){
+		mouseover="";
+	}else if(mouseover=="yes" || mouseover=="click"){
+		mouseover="hide";
+	}else if(mouseover=="no"){
+		mouseover="";
+	}
+	var local = [];
+	var times=[];
+	Object.keys(obj).forEach(function(key) {
+		var toot = obj[key].last_status;
+		var dis_name=escapeHTML(toot.account.display_name);
+		if(toot.account.emojis){
+			var actemojick = toot.account.emojis[0];
+		}else{
+			var actemojick=false;
+		}
+		//絵文字があれば
+		if (actemojick) {
+			Object.keys(toot.account.emojis).forEach(function(key5) {
+				var emoji = toot.account.emojis[key5];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				dis_name = dis_name.replace(regExp, emoji_url);
+				
+			});
+		}
+		var noticeavatar="";
+			var if_notf="";
+			var uniqueid=toot.id;
+			var notice = "";
+			var boostback = "";
+			//ユーザー強調
+			if(toot.account.username!=toot.account.acct){
+				var fullname=toot.account.acct;
+			}else{
+				var domain = localStorage.getItem("domain_" + acct_id);
+				var fullname=toot.account.acct+"@"+domain;
+			}
+			if(useremp){
+				Object.keys(useremp).forEach(function(key10) {
+				var user = useremp[key10];
+				if(user==fullname){
+					boostback = "emphasized";
+				}
+			});
+		}
+        var id = toot.id;
+        var home = "";
+		if (toot.account.locked) {
+			var locked = ' <i class="fa fa-lock red-text"></i>';
+		} else {
+			var locked = "";
+		}
+		if (!toot.application) {
+			var via = '';
+			viashow="hide";
+		} else {
+			var via = toot.application.name;
+			//強調チェック
+			Object.keys(emp).forEach(function(key6) {
+				var cli = emp[key6];
+				if(cli == via){
+					boostback = "emphasized";
+				}
+			});
+			//ミュートチェック
+			Object.keys(mute).forEach(function(key7) {
+				var cli = mute[key7];
+				if(cli == via){
+					boostback = "hide";
+				}
+			});
+		}
+		if(mix=="pinned"){
+			boostback = "emphasized";
+		}
+		if (toot.spoiler_text && cw) {
+			var content = toot.content;
+			var spoil = escapeHTML(toot.spoiler_text);
+			var spoiler = "cw cw_hide_" + toot.id;
+			var api_spoil = "gray";
+			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+				'\')" class="nex parsed">'+lang.lang_parse_cwshow+'</a><br>';
+		} else {
+			var ct1 = toot.content.split('</p>').length + toot.content.split('<br />').length -2;
+			var ct2 = toot.content.split('</p>').length + toot.content.split('<br>').length -2;
+			if(ct1>ct2){ var ct= ct1; }else{ var ct= ct2;  }
+			if ((sent < ct && $.mb_strlen($.strip_tags(toot.content)) > 5) || ($.strip_tags(toot.content).length > ltr && $.mb_strlen($.strip_tags(toot.content)) > 5)) {
+				var content = '<span class="gray">'+lang.lang_parse_fulltext+'</span><br>' + toot.content
+				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tags(
+						toot.content), 0, 100) +
+					'</span><span class="gray">'+lang.lang_parse_autofold+'</span>';
+				var spoiler = "cw cw_hide_" + toot.id;
+				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+					'\')" class="nex parsed">'+lang.lang_parse_more+'</a><br>';
+			} else {
+				var content = toot.content;
+				var spoil = escapeHTML(toot.spoiler_text);
+				var spoiler = "";
+				var spoiler_show = "";
+			}
+		}
+		var urls = $.strip_tags(content).replace(/\n/g, " ").match(
+			/https?:\/\/([-a-zA-Z0-9@.]+)\/?(?!.*((media|tags)|mentions)).*([-_.!~*\'()a-zA-Z0-9;\/?:\@&=+\$,%#]+)?/
+		);
+		if (urls) {
+			var analyze = '<a onclick="additionalIndv(\'' + tlid + '\',' + acct_id +
+				',\'' + id + '\')" class="add-show pointer">'+lang.lang_parse_url+'</a><br>';
+		} else {
+			var analyze = '';
+		}
+		var viewer = "";
+		var hasmedia = "";
+		var youtube = "";
+		if(toot.emojis){
+			var emojick = toot.emojis[0];
+		}else{
+			var emojick=false;
+		}
+		//絵文字があれば
+		if (emojick) {
+			Object.keys(toot.emojis).forEach(function(key5) {
+				var emoji = toot.emojis[key5];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
+		}
+		//ニコフレ絵文字
+		if(toot.profile_emojis){
+			var nicoemojick = toot.profile_emojis[0];
+		}else{
+			var nicoemojick=false;
+		}
+		//絵文字があれば
+		if (nicoemojick) {
+			Object.keys(toot.profile_emojis).forEach(function(keynico) {
+				var emoji = toot.profile_emojis[keynico];
+				var shortcode = emoji.shortcode;
+				var emoji_url = '<img src="' + emoji.url +
+					'" class="emoji-img" data-emoji="'+shortcode+'" alt=" :'+shortcode+': ">';
+				var regExp = new RegExp(":" + shortcode + ":", "g");
+				content = content.replace(regExp, emoji_url);
+				spoil = spoil.replace(regExp, emoji_url);
+			});
+		}
+		//デフォ絵文字
+		content=twemoji.parse(content);
+		if(dis_name){
+			dis_name=twemoji.parse(dis_name);
+		}
+		if(spoil){
+			spoil=twemoji.parse(spoil);
+		}
+		var mediack = toot.media_attachments[0];
+		//メディアがあれば
+		var media_ids="";
+		if (mediack) {
+			hasmedia = "hasmedia";
+			var cwdt = 100 / toot.media_attachments.length;
+			Object.keys(toot.media_attachments).forEach(function(key2) {
+				var media = toot.media_attachments[key2];
+				var purl = media.preview_url;
+				media_ids=media_ids+media.id+",";
+				var url = media.url;
+				if (toot.sensitive && nsfw) {
+					var sense = "sensitive"
+				} else {
+					var sense = ""
+				}
+				viewer = viewer + '<a onclick="imgv(\'' + id + '\',\'' + key2 + '\',\'' +
+					acct_id + '\')" id="' + id + '-image-' + key2 + '" data-url="' + url +
+					'" data-type="' + media.type + '" class="img-parsed"><img src="' +
+					purl + '" class="' + sense +
+					' toot-img pointer" style="width:' + cwdt + '%; height:'+imh+'px;"></a></span>';
+			});
+			media_ids = media_ids.slice(0, -1) ;
+		} else {
+			viewer = "";
+			hasmedia = "nomedia";
+		}
+		var menck = toot.mentions[0];
+		var mentions = "";
+		//メンションであれば
+		if (menck) {
+			mentions = "";
+			Object.keys(toot.mentions).forEach(function(key3) {
+				var mention = toot.mentions[key3];
+				mentions = mentions + '<a onclick="udg(\'' + mention.id + '\',' +
+					acct_id + ')" class="pointer">@' + mention.acct + '</a> ';
+			});
+			mentions = '<div style="float:right">' + mentions + '</div>';
+		}
+		var tagck = toot.tags[0];
+		var tags = "";
+		//タグであれば
+		if (tagck) {
+			Object.keys(toot.tags).forEach(function(key4) {
+				var tag = toot.tags[key4];
+				tags = tags + '<span class="hide" data-tag="' + tag.name + '">#' + tag.name + ':<a onclick="tl(\'tag\',\'' + tag.name + '\',' + acct_id +
+					',\'add\')" class="pointer" title="' +lang.lang_parse_tagTL.replace("{{tag}}" ,'#'+tag.name)+ '">TL</a>　<a onclick="brInsert(\'#' + tag.name + '\')" class="pointer" title="' + lang.lang_parse_tagtoot.replace("{{tag}}" ,'#'+tag.name) + '">Toot</a>　'+
+					'<a onclick="tagPin(\'' + tag.name + '\')" class="pointer" title="' +lang.lang_parse_tagpin.replace("{{tag}}" ,'#'+tag.name)+ '">Pin</a></span> ';
+			});
+			tags = '<div style="float:right">' + tags + '</div>';
+		}
+		//リプ数
+		if(toot.replies_count || toot.replies_count===0){
+			var replyct=toot.replies_count;
+		}else{
+			var replyct="";
+        }
+		//公開範囲を取得
+		var vis = "";
+		var visen = toot.visibility;
+		if (visen == "public") {
+			var vis =
+				'<i class="text-darken-3 material-icons gray sml vis-data pointer" title="'+lang.lang_parse_public+'('+lang.lang_parse_clickcopy+')" data-vis="public" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">public</i>';
+			var can_rt = "";
+		} else if (visen == "unlisted") {
+			var vis =
+				'<i class="text-darken-3 material-icons blue-text vis-data pointer" title="'+lang.lang_parse_unlisted+'('+lang.lang_parse_clickcopy+')" data-vis="unlisted" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock_open</i>';
+			var can_rt = "";
+		} else if (visen == "private") {
+			var vis =
+				'<i class="text-darken-3 material-icons orange-text vis-data pointer" title="'+lang.lang_parse_private+'('+lang.lang_parse_clickcopy+')" data-vis="private" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">lock</i>';
+			var can_rt = "hide";
+		} else if (visen == "direct") {
+			var vis =
+				'<i class="text-darken-3 material-icons red-text vis-data pointer" title="'+lang.lang_parse_direct+'('+lang.lang_parse_clickcopy+')" data-vis="direct" onclick="staCopy(\''+id+'\')" style="font-size:1rem;">mail</i>';
+			var can_rt = "hide";
+		}
+		if (toot.account.acct == localStorage.getItem("user_" + acct_id)) {
+			var if_mine = "";
+			var mine_via="type-b";
+		} else {
+			var if_mine = "hide";
+			var mine_via="";
+		}
+		if (toot.favourited) {
+			var if_fav = " yellow-text";
+			var fav_app = "faved";
+		} else {
+			var if_fav = "";
+			var fav_app = "";
+		}
+		if (toot.reblogged) {
+			var if_rt = "teal-text";
+			var rt_app = "rted";
+		} else {
+			var if_rt = "";
+			var rt_app = "";
+		}
+		if (toot.pinned) {
+			var if_pin = "blue-text";
+			var pin_app = "pinned";
+		} else {
+			var if_pin = "";
+			var pin_app = "";
+		}
+		//アニメ再生
+		if (gif == "yes") {
+			var avatar = toot.account.avatar;
+		} else {
+			var avatar = toot.account.avatar_static;
+		}
+		//ワードミュート
+		if(wordmute){
+			Object.keys(wordmute).forEach(function(key8) {
+				var worde = wordmute[key8];
+				if(worde){
+					if(worde.tag){
+						var word=worde.tag;
+					}else{
+						var word=worde
+					}
+					var regExp = new RegExp( word, "g" ) ;
+					if($.strip_tags(content).match(regExp)){
+						boostback = "hide by_filter";
+					}
+				}
+			});
+		}
+		//ワード強調
+		if(wordemp){
+			Object.keys(wordemp).forEach(function(key9) {
+				var word = wordemp[key9];
+				if(word){
+					var word=word.tag;
+					var regExp = new RegExp( word, "g" ) ;
+					content=content.replace(regExp,'<span class="emp">'+word+"</span>");
+				}
+			});
+		}
+		//日本語じゃない
+		if(toot.language!="ja"){
+			var trans='<div class="action pin"><a onclick="trans(\''+toot.language+'\')" class="waves-effect waves-dark btn-flat" style="padding:0" title="'+lang.lang_parse_trans+'"><i class="material-icons">g_translate</i></a></div>';
+		}else{
+			var trans="";
+		}
+		//Cards
+		if (!card && toot.card) {
+			var cards=toot.card;
+				if (cards.provider_name=="Twitter"){
+					if(cards.image){
+						var twiImg='<br><img src="'+cards.image+'">';
+					}else{
+						var twiImg='';
+					}
+					analyze='<blockquote class="twitter-tweet"><b>'+escapeHTML(cards.author_name)+'</b><br>'+escapeHTML(cards.description)+twiImg+'</blockquote>';
+				}
+				if (cards.title) {
+					analyze="<span class=\"gray\">URL"+lang.lang_cards_check+":<br>Title:" + escapeHTML(cards.title) + "<br>" +
+						escapeHTML(cards.description) + "</span>";
+				}
+				if (cards.html) {
+					analyze=cards.html+'<i class="material-icons" onclick="pip('+id+')" title="'+lang.lang_cards_pip+'">picture_in_picture_alt</i>';
+				}
+			
+		}
+		//Ticker
+		var tickerdom="";
+		if(ticker){
+			var tickerdata=localStorage.getItem("ticker")
+			if(tickerdata){
+			var tickerdata=JSON.parse(tickerdata);
+			
+			var thisdomain=toot.account.acct.split("@");
+			if(thisdomain.length>1){
+				thisdomain=thisdomain[1];
+			}
+			for( var i=0; i<tickerdata.length; i++) {
+				var value=tickerdata[i];
+				if(value.domain==thisdomain){
+					var tickerdom='<div style="background:linear-gradient(to left,transparent, '+value.bg+' 96%) !important; color:'+value.text+';width:100%; height:0.9rem; font-size:0.8rem;"><img src="'+value.image+'" style="height:100%;"><span style="position:relative; top:-0.2rem;"> '+value.name+'</span></div>';
+					break;
+				}
+		   }
+		}
+		}
+		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
+			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
+			' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
+				key].created_at, 'unix') + '" '+if_notf+' onclick="dmStatus()">' +
+			'<div class="area-notice"><span class="gray sharesta">' + notice + home +
+			'</span></div>' +
+			'<div class="area-icon"><a onclick="udg(\'' + toot.account.id +
+			'\',' + acct_id + ');" user="' + toot.account.acct + '" class="udg">' +
+			'<img src="' + avatar +
+			'" width="40" class="prof-img" user="' + toot.account.acct +
+			'"></a>'+noticeavatar+'</div>' +
+			'<div class="area-display_name"><div class="flex-name"><span class="user">' +
+			dis_name +
+			'</span><span class="sml gray" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; cursor:text;"> @' +
+			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>' +
+			date(toot.created_at, datetype) + '</span>' +
+			'</div></div>' +
+			'<div class="area-toot">'+tickerdom+'<span class="' +
+			api_spoil + ' cw_text_' + toot.id + '"><span class="cw_text">' + spoil + "</span>" + spoiler_show +
+			'</span><span class="toot ' + spoiler + '">' + content +
+			'</span>' +
+			'' + viewer + '' +
+			'</div>'+
+			'<div class="area-vis"></div>'+
+			'</div></div>';
+	});
+	return templete;
+}
--- a/app/js/tl/filter.js
+++ b/app/js/tl/filter.js
@ -14,19 +14,27 @@ function mediaToggle(tlid) {
        $("#timeline_"+tlid).addClass("media-filter")
 	}
 }
-//各TL上方のBT[On/Off]
+//各TL上方のBT[BTOnly/BTExc/Off]
 function ebtToggle(tlid) {
 	var ebt = localStorage.getItem("ebt_" + tlid);
-	if (ebt) {
+	if (ebt=="true") {
+		localStorage.setItem("ebt_" + tlid, "but");
+		$("#sta-bt-" + tlid).text("BT Only");
+        $("#sta-bt-" + tlid).css("color",'#ff9800');
+		$("#timeline_"+tlid).addClass("except-bt-filter")
+		$("#timeline_"+tlid).removeClass("bt-filter")
+	}else if (ebt=="but") {
        localStorage.removeItem("ebt_" + tlid);
 		$("#sta-bt-" + tlid).text("Off");
        $("#sta-bt-" + tlid).css("color",'red');
 		$("#timeline_"+tlid).removeClass("bt-filter")
+		$("#timeline_"+tlid).removeClass("except-bt-filter")
 	} else {
 		localStorage.setItem("ebt_" + tlid, "true");
-		$("#sta-bt-" + tlid).text("On");
+		$("#sta-bt-" + tlid).text("BT Ex");
        $("#sta-bt-" + tlid).css("color",'#009688');
 		$("#timeline_"+tlid).addClass("bt-filter")
+		$("#timeline_"+tlid).removeClass("except-bt-filter")
 	}
 }
 //各TL上方のMedia[On/Off]をチェック
@ -45,14 +53,21 @@ function mediaCheck(tlid) {
 //各TL上方のBT[On/Off]をチェック
 function ebtCheck(tlid) {
 	var ebt = localStorage.getItem("ebt_" + tlid);
-	if (ebt) {
-		$("#sta-bt-" + tlid).text("On");
+	if (ebt=="true") {
+		$("#sta-bt-" + tlid).text("BT Ex");
        $("#sta-bt-" + tlid).css("color",'#009688');
 		$("#timeline_"+tlid).addClass("bt-filter")
-	} else {
+		$("#timeline_"+tlid).removeClass("except-bt-filter")
+	} else if (ebt=="but") {
+		$("#sta-bt-" + tlid).text("BT Only");
+        $("#sta-bt-" + tlid).css("color",'#ff9800');
+		$("#timeline_"+tlid).addClass("except-bt-filter")
+		$("#timeline_"+tlid).removeClass("bt-filter")
+	} else{
 		$("#sta-bt-" + tlid).text("Off");
        $("#sta-bt-" + tlid).css("color",'red');
 		$("#timeline_"+tlid).removeClass("bt-filter")
+		$("#timeline_"+tlid).removeClass("except-bt-filter")
 	}
 }
 /* 削除追跡*/
--- a/app/js/tl/notification.js
+++ b/app/js/tl/notification.js
@ -15,18 +15,16 @@ function notfColumn(acct_id, tlid, sys){
 		native="yes";
 	}
 	var domain = localStorage.getItem("domain_" + acct_id);
+	console.log(start)
+	var httpreq = new XMLHttpRequest();
 	if(localStorage.getItem("mode_" + domain)=="misskey"){
 		var misskey=true;
 		var start = "https://" + domain + "/api/i/notifications";
-		var i={
-			method: 'POST',
-			headers: {
-				'content-type': 'application/json',
-			},
-			body:JSON.stringify({
+		httpreq.open(POST, start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		var body=JSON.stringify({
 			i:at
-			})
-		}
+		});
 	}else{
 		var misskey=false;
 		if(localStorage.getItem("exclude-"+tlid)){
@ -35,21 +33,18 @@ function notfColumn(acct_id, tlid, sys){
 			var exc="";
 		}
 		var start = "https://" + domain + "/api/v1/notifications"+exc;
-		var i={
-			method: 'GET',
-			headers: {
-				'content-type': 'application/json',
-				'Authorization': 'Bearer ' + at
-			},
+		httpreq.open("GET", start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		var body="";
 	}
-	}
-	fetch(start, i).then(function(response) {
-		console.log(response.headers.get('link'));
-		return response.json();
-	}).catch(function(error) {
-		todo(error);
-		console.error(error);
-	}).then(function(json) {
+	
+	httpreq.responseType = 'json';
+	httpreq.send(body);
+    httpreq.onreadystatechange = function() {
+		if (httpreq.readyState == 4) {
+			var json = httpreq.response;
+			var max_id = httpreq.getResponseHeader("link").match(/\?max_id=([0-9]+)/)[1];
 			if(json[0]){
 				var templete="";
 				var lastnotf=localStorage.getItem("lastnotf_" + acct_id);
@ -95,13 +90,15 @@ function notfColumn(acct_id, tlid, sys){
 						
 					}
 				});
+				templete=templete+'<div class="hide notif-marker" data-maxid="'+max_id+'"></div>';
 				$("#timeline_" + tlid).html(templete);
 				$("#landing_" + tlid).hide();
 				jQuery("time.timeago").timeago();
 				}
 				$("#notf-box").addClass("fetched");
 				todc();
-	});
+		}
+	}
 	if(!misskey){
 		if(localStorage.getItem("streaming_" + acct_id)){
 			var wss=localStorage.getItem("streaming_" + acct_id)
@ -355,6 +352,8 @@ function notfCommon(acct_id, tlid, sys) {
 }
 //一定のスクロールで発火
 function notfmore(tlid) {
+	console.log(moreloading);
+	console.log("kicked");
 	var multi = localStorage.getItem("column");
 	var obj = JSON.parse(multi);
 	var acct_id = obj[tlid].domain;
@ -363,72 +362,79 @@ function notfmore(tlid) {
 	}else{
 		var data;
 	}
-	var sid = $("#timeline_" + tlid + " .cvo").last().attr("toot-id");
-	console.log(sid);
-	if (localStorage.getItem("morelock") != sid) {
-		localStorage.setItem("morelock", sid);
-		localStorage.setItem("now", type);
-		todo("Notfication TL MoreLoading");
-		var domain = localStorage.getItem("domain_" + acct_id);
+	var sid = $("#timeline_" + tlid + " .notif-marker").last().attr("data-maxid");
 	var at = localStorage.getItem("acct_"+ acct_id + "_at");
-
+	var domain = localStorage.getItem("domain_" + acct_id);
+	if (sid && !moreloading) {
+		moreloading=true;
+	var httpreq = new XMLHttpRequest();
 	if(localStorage.getItem("mode_" + domain)=="misskey"){
 		var misskey=true;
 		var start = "https://" + domain + "/api/i/notifications";
-				var i={
-					method: 'POST',
-					headers: {
-						'content-type': 'application/json',
-					},
-					body:JSON.stringify({
+		httpreq.open(POST, start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		var body=JSON.stringify({
 			i:at,
-						untilId:sid
-					})
-				}
+			untilID:sid
+		});
 	}else{
 		var misskey=false;
-				var start = "https://" + domain + "/api/v1/notifications"+
-					"max_id=" + sid;
-				var i={
-					method: 'GET',
-					headers: {
-						'content-type': 'application/json',
-						'Authorization': 'Bearer ' + at
-					},
-				}
-			}
-		fetch(start, i,
-		).then(function(response) {
-			return response.json();
-		}).catch(function(error) {
-			todo(error);
-			console.error(error);
-		}).then(function(json) {
-			var templete="";
-			Object.keys(json).forEach(function(key) {
-				var obj = json[key];
-				if(obj.type!="follow"){
-					if(misskey){
-						templete = templete+misskeyParse([obj.note], '', acct_id, tlid, -1);
+		if(localStorage.getItem("exclude-"+tlid)){
+			var exc=localStorage.getItem("exclude-"+tlid)+"&max_id="+sid;
 		}else{
-						templete = templete+parse([obj], '', acct_id, tlid, -1);
-					}
-				}else{
-					if(misskey){
-						templete = templete+misskeyUserparse([obj], '', acct_id, tlid, -1);
-					}else{
-						templete = templete+userparse([obj.account], '', acct_id, tlid, -1);
+			var exc="?max_id="+sid;
 		}
+		var start = "https://" + domain + "/api/v1/notifications"+exc;
+		httpreq.open("GET", start, true);
+		httpreq.setRequestHeader('Content-Type', 'application/json');
+		httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
+		var body="";
 	}
 	
-			});
-			$("#timeline_" + tlid).append(templete);
-			additional(acct_id, tlid);
-			jQuery("time.timeago").timeago();
-			localStorage.removeItem("morelock")
-			todc();
-		});
+	httpreq.responseType = 'json';
+	httpreq.send(body);
+    httpreq.onreadystatechange = function() {
+		if (httpreq.readyState == 4) {
+			var json = httpreq.response;
+			console.log(json);
+			var max_id = httpreq.getResponseHeader("link").match(/\?max_id=([0-9]+)/)[1];
+			if(json[0]){
+				var templete="";
+				var lastnotf=localStorage.getItem("lastnotf_" + acct_id);
+				localStorage.setItem("lastnotf_" + acct_id,json[0].id);
+				Object.keys(json).forEach(function(key) {
+					var obj = json[key];
+					if(localStorage.getItem("filter_"+ acct_id)!="undefined"){
+						var mute=getFilterType(JSON.parse(localStorage.getItem("filter_"+ acct_id)),"notif");
+					}else{
+						var mute=[];
 					}
+					if(obj.type!="follow"){
+						if(misskey){
+							templete = templete+misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute);
+						}else{
+							templete = templete+parse([obj], 'notf', acct_id, 'notf', -1, mute);
+						}
+					}else{
+						if(misskey){
+							templete = templete+misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute);
+						}else{
+							templete = templete+userparse([obj.account], 'notf', acct_id, 'notf', -1);
+						}
+						
+					}
+				});
+				moreloading=false;
+				templete=templete+'<div class="hide notif-marker" data-maxid="'+max_id+'"></div>';
+				$("#timeline_" + tlid).append(templete);
+				$("#landing_" + tlid).hide();
+				jQuery("time.timeago").timeago();
+				}
+				$("#notf-box").addClass("fetched");
+				todc();
+		}
+	}
+}
 }

 //通知トグルボタン
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@ -73,6 +73,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 	}else{
 		var ticker=false;
 	}
+	//Animation
+	var anime = localStorage.getItem("animation");
+	if (anime=="yes" || !anime) {
+			var animecss="cvo-anime";
+	}else{
+			var animecss="";
+	}
 	//Cards
 	var card = localStorage.getItem("card_" + tlid);
 	
@ -323,7 +330,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			} else {
 				var uniqueid=toot.id;
 				var notice = "";
-				var boostback = "";
+				var boostback = "unshared";
 				//ユーザー強調
 				if(toot.account.username!=toot.account.acct){
 					var fullname=toot.account.acct;
@ -652,9 +659,36 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		   }
 		}
 		}
+		//Poll
+		var poll="";
+		if(toot.poll){
+			var choices=toot.poll.options;
+			if(toot.poll.voted){
+				var myvote=lang.lang_parse_voted;
+				var result_hide="";
+			}else{
+				myvote='<a onclick="voteMastodon(\''+acct_id+'\',\''+toot.poll.id+'\')" class="votebtn">'+lang.lang_parse_vote+'</a><br>';
+				myvote=myvote+'<a onclick="showResult(\''+acct_id+'\',\''+toot.poll.id+'\')" class="pointer">'+lang.lang_parse_unvoted+"</a>";
+				var result_hide="hide";
+			}
+			Object.keys(choices).forEach(function(keyc) {
+				var choice = choices[keyc];
+				if(!toot.poll.voted){
+					var votesel='voteSelMastodon(\''+acct_id+'\',\''+toot.poll.id+'\','+keyc+','+toot.poll.multiple+')';
+					var voteclass="pointer waves-effect waves-light";
+				}else{
+					var votesel="";
+					var voteclass="";
+				}
+				poll=poll+'<div class="'+voteclass+' vote vote_'+acct_id+'_'+toot.poll.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+toot.poll.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
+			});
+			poll='<div class="vote_'+acct_id+'_'+toot.poll.id+'">'+poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(toot.poll.expires_at, 'absolute') +
+			'"><i class="fa fa-calendar-times-o"></i>' +
+			date(toot.poll.expires_at, datetype) + '</span></div>';
+		}
 		templete = templete + '<div id="pub_' + toot.id + '" class="cvo ' +
 			boostback + ' ' + fav_app + ' ' + rt_app + ' ' + pin_app +
-			' ' + hasmedia + '" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
+			' ' + hasmedia + ' '+animecss+'" toot-id="' + id + '" unique-id="' + uniqueid + '" data-medias="'+media_ids+' " unixtime="' + date(obj[
 				key].created_at, 'unix') + '" '+if_notf+' onmouseover="mov(\'' + toot.id + '\',\''+tlid+'\',\'mv\')" onclick="mov(\'' + toot.id + '\',\''+tlid+'\',\'cl\')" onmouseout="resetmv(\'mv\')">' +
 			'<div class="area-notice"><span class="gray sharesta">' + notice + home +
 			'</span></div>' +
@ -679,7 +713,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter) {
 			'' + viewer + '' +
 			'</div><div class="area-additional"><span class="additional">' + analyze +
 			'</span>' +
-			'' + mentions + tags + '</div>' +
+			'' +poll+ mentions + tags + '</div>' +
 			'<div class="area-vis"></div>'+
 			'<div class="area-actions '+mouseover+'">' +
 			'<div class="action">'+vis+'</div>'+
@ -757,8 +791,8 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 			var auth = "";
 		}
 		var ftxt=lang.lang_parse_followed;
-		if(!locale && localStorage.getItem("follow_" + acct_id)){
-			ftxt = localStorage.getItem("follow_" + acct_id);
+		if(!locale && localStorage.getItem("followlocale_" + acct_id)){
+			ftxt = localStorage.getItem("followlocale_" + acct_id);
 		}
 		if(popup > 0 || popup==-1 || notf){
 			var notftext=ftxt+'<br>';
--- a/app/js/tl/poll.js
+++ b/app/js/tl/poll.js
@ -0,0 +1,119 @@
+//アンケートのトグル
+function pollToggle() {
+	if ($("#poll").hasClass("hide")) {
+        $("#right-side").show()
+		$("#poll").removeClass("hide")
+	} else {
+        $("#right-side").hide()
+        $("#emoji").addClass("hide")
+		$("#poll").addClass("hide")
+	}
+}
+function pollProviderCk(){
+    $(".poll-provider").addClass("hide");
+    $("#"+$("#poll-sel").val()).removeClass("hide");
+}
+/*
+function pollAddtime(num){
+    var last=$("#expires_in").val();
+    last=last*1-(num*-1);
+    $("#expires_in").val(last);
+    pollCalc();
+}
+*/
+function pollCalc(){
+    var days=$("#days_poll").val();
+    var hrs=$("#hours_poll").val();
+    var mins=$("#mins_poll").val();
+    console.log(days*86400+hrs*3600+mins*60)
+    return days*86400+hrs*3600+mins*60;
+
+}
+//Vote
+function voteSelMastodon(acct_id,id,to,mul){
+    console.log('.vote_'+acct_id+'_'+id+'_'+to);
+    if($('.vote_'+acct_id+'_'+id+'_'+to).hasClass("sel")){
+        $('.vote_'+acct_id+'_'+id+'_'+to).css("background-color","transparent")
+        $('.vote_'+acct_id+'_'+id+'_'+to).removeClass("sel");
+    }else{
+        if(!mul){
+            $('.vote_'+acct_id+'_'+id+' div' ).each(function(i, elem) {
+                if(i==to){
+                    $(this).css("background-color","var(--emphasized)");
+                    $(this).addClass("sel");
+                }else{
+                    $(this).css("background-color","transparent")
+                    $(this).removeClass("sel");
+                }
+            });
+        }else{
+            $('.vote_'+acct_id+'_'+id+'_'+to).css("background-color","var(--emphasized)")
+            $('.vote_'+acct_id+'_'+id+'_'+to).addClass("sel");
+        }
+    }
+    
+}
+function voteMastodon(acct_id,id){
+    var choice=[];
+    $('.vote_'+acct_id+'_'+id+' div' ).each(function(i, elem) {
+        if($(this).hasClass("sel")){
+            choice.push(i+"");
+        }
+    });
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_"+ acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/polls/"+id+"/votes";
+    if(localStorage.getItem("mode_" + domain)=="misskey"){
+        return false;
+    }
+	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(JSON.stringify({choices:choice}));
+    httpreq.onreadystatechange = function() {
+		voteMastodonrefresh(acct_id,id)
+	}
+}
+function showResult(acct_id,id){
+    $('.vote_'+acct_id+'_'+id+'_result').toggleClass("hide")
+}
+function voteMastodonrefresh(acct_id,id){
+    var datetype = localStorage.getItem("datetype");
+    if (!datetype) {
+		datetype = "absolute";
+	}
+    var httpreqd = new XMLHttpRequest();
+    var domain = localStorage.getItem("domain_" + acct_id);
+    var at = localStorage.getItem("acct_"+ acct_id + "_at");
+    var start = "https://" + domain + "/api/v1/polls/"+id;
+	httpreqd.open('GET', start, true);
+	httpreqd.setRequestHeader('Content-Type', 'application/json');
+    httpreqd.responseType = 'json';
+	httpreqd.send(JSON.stringify({i:at,noteId:id}));
+    httpreqd.onreadystatechange = function() {
+		if (httpreqd.readyState == 4) {
+            var json = httpreqd.response;
+            console.log(json);
+            if(!json){
+                return false;
+            }
+            var poll="";
+		    var choices=json.options;
+			var myvote=lang.lang_parse_voted;
+			var result_hide="";
+			Object.keys(choices).forEach(function(keyc) {
+				var choice = choices[keyc];
+				if(!json.voted){
+					votesel='voteSelMastodon(\''+acct_id+'\',\''+json.id+'\','+keyc+','+json.multiple+')';
+				}
+				poll=poll+'<div class="pointer vote vote_'+acct_id+'_'+json.id+'_'+keyc+'" onclick="'+votesel+'">'+choice.title+'<span class="vote_'+acct_id+'_'+json.id+'_result '+result_hide+'">('+choice.votes_count+')</span></div>';
+			});
+			poll=poll+myvote+'<span class="cbadge cbadge-hover" title="' + date(json.expires_at, 'absolute') +
+			'"><i class="fa fa-calendar-times-o"></i>' +
+            date(json.expires_at, datetype) + '</span>';
+            $('.vote_'+acct_id+'_'+json.id).html(poll)
+		}
+	}
+}
--- a/app/js/tl/tl.js
+++ b/app/js/tl/tl.js
@ -1,4 +1,5 @@
 //TL取得
+moreloading=false;
 function tl(type, data, acct_id, tlid, delc, voice, mode) {
 	scrollevent();
 	localStorage.removeItem("morelock");
@ -52,6 +53,13 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 			"user_" + acct_id) + "@" + domain + ")");
 			$("#notice_icon_" + tlid).text("notifications");
 		return;
+	}else if (type == "dm") {
+		//DMなら飛ばす
+		dm(acct_id, tlid, "plus",delc,voice);
+		$("#notice_" + tlid).text(cap(type, data, acct_id) + "(" + localStorage.getItem(
+			"user_" + acct_id) + "@" + domain + ")");
+			$("#notice_icon_" + tlid).text("notifications");
+		return;
 	}
 	localStorage.setItem("now", type);
 	todo(cap(type) + " TL Loading...");
@ -360,8 +368,7 @@ function moreload(type, tlid) {
 		var data=obj[tlid].data;
 	}
 	var sid = $("#timeline_" + tlid + " .cvo").last().attr("unique-id");
-	if (sid && localStorage.getItem("morelock") != sid) {
-		localStorage.setItem("morelock", sid);
+	if (sid && !moreloading) {
 		if (type == "mix" && localStorage.getItem("mode_" + localStorage.getItem("domain_" + acct_id))!="misskey") {
 			mixmore(tlid,"integrated");
 			return;
@ -372,6 +379,7 @@ function moreload(type, tlid) {
 			notfmore(tlid);
 			return;
 		}
+		moreloading=true;
 		localStorage.setItem("now", type);
 		todo(cap(type) + " TL MoreLoading");
 		if(type!="noauth"){
@ -441,7 +449,7 @@ function moreload(type, tlid) {
 			$("#timeline_" + tlid).append(templete);
 			additional(acct_id, tlid);
 			jQuery("time.timeago").timeago();
-			localStorage.removeItem("morelock")
+			moreloading=false;
 			todc();
 		});
 	}
@ -571,7 +579,7 @@ function com(type, data) {
 	}else if (type == "list") {
 		return "list/" + data + "?"
 	}else if (type="dm") {
-		return "direct?"
+		return "/api/v1/conversations?"
 	}
 }
 function misskeycom(type, data) {
--- a/app/js/ui/layout.js
+++ b/app/js/ui/layout.js
@ -128,6 +128,12 @@ function parseColumn() {
 		if (width) {
 			var css=" min-width:"+width+"px;"
 		}
+		var anime = localStorage.getItem("animation");
+		if (anime=="yes" || !anime) {
+			var animecss="box-anime";
+		}else{
+			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> '+
@ -141,7 +147,7 @@ function parseColumn() {
 		}else{
 			var exclude="";
 		}
-		var html = '<div style="'+css+'" class="box" id="timeline_box_' + key + '_box" tlid="' + key +
+		var html = '<div style="'+css+'" class="box '+animecss+'" id="timeline_box_' + key + '_box" tlid="' + key +
 			'" data-acct="'+acct.domain+'"><div class="notice-box z-depth-2" id="menu_'+key+'" style="'+insert+' ">'+
 			'<div class="area-notice"><i class="material-icons waves-effect red-text" id="notice_icon_' + key + '"'+notf_attr+' style="font-size:40px; padding-top:25%;" onclick="goTop(' + key + ')" title="'+lang.lang_layout_gotop +'"></i></div>'+
 			'<div class="area-notice_name"><span id="notice_' + key + '" class="tl-title"></span></div>'+
@ -163,7 +169,7 @@ function parseColumn() {
 		  ')" class="setting nex"><i class="material-icons waves-effect nex" title="'+lang.lang_layout_tts +'">hearing</i><span id="sta-voice-' +
 		  key + '">On</span></a>'+lang.lang_layout_tts +'TL<br><a onclick="reconnector(' + key +
 		  ',\''+acct.type+'\',\''+acct.domain+'\',\''+acct.data+'\')" class="setting nex '+if_notf+'"><i class="material-icons waves-effect nex '+if_notf+'" title="'+lang.lang_layout_reconnect+'">low_priority</i></a><span class="'+if_notf+'">'+lang.lang_layout_reconnect+'</span><br>'+lang.lang_layout_headercolor +'<br><div id="picker_'+key+'" class="color-picker"></div></div><div class="tl-box" tlid="' + key + '"><div id="timeline_' + key +
-			'" class="tl '+acct.type+'-timeline" tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div></div>';
+			'" class="tl '+acct.type+'-timeline " tlid="' + key + '" data-type="' + acct.type + '" data-acct="'+acct.domain+'"><div id="landing_'+key+'" style="text-align:center">'+lang.lang_layout_nodata +'</div></div></div></div>';
 		$("#timeline-container").append(html);
 		localStorage.removeItem("pool_" + key);
 		if (acct.data) {
--- a/app/js/ui/post-box.js
+++ b/app/js/ui/post-box.js
@ -1,10 +1,8 @@
 /*ささやきボックス(Cr民並感)*/
 //✕隠す
 function hide() {
-	$('#post-box').removeClass("appear")
-	$('#post-box').animate({
-		'bottom': "-500px"
-	});
+	$('#post-box').fadeOut()
+	$("#post-box").removeClass("appear")
 	$("#emoji").addClass("hide")
 }
 //最小化
@ -18,16 +16,23 @@ function mini() {
 }
 //最小化時に展開
 function show() {
+	$("#post-box").addClass("appear")
 	$("#textarea").focus();
-	$('#post-box').addClass("appear")
-	console.log($('#posttgl').offset());
-	$('#post-box').css("left",$('#posttgl').offset().left+"px");
-	$('#post-box').animate({
-		'bottom': 0
-	});
+	console.log("show"+localStorage.getItem("postbox-left"));
+	$('#post-box').css("left",localStorage.getItem("postbox-left")+"px")
+	$('#post-box').css("top",localStorage.getItem("postbox-top")+"px")
+	$('#post-box').fadeIn();
 }

-
+$(function() {
+  $( "#post-box" ).draggable({handle: "#post-bar",
+	stop: function() {
+		console.log("stopped");
+	  localStorage.setItem("postbox-left",$('#post-box').offset().left);
+	  localStorage.setItem("postbox-top",$('#post-box').offset().top);
+	}
+  });
+});

 //コード受信
 if(location.search){
@ -43,9 +48,11 @@ if(location.search){
 		$(".mini-btn").text("expand_less");
 	}
 }
-$('#posttgl').focusin(function(e) {
+$('#posttgl').click(function(e) {
 	if(!$('#post-box').hasClass("appear")){
 		show();
+	}else{
+		hide();
 	}
 });

--- a/app/js/ui/scroll.js
+++ b/app/js/ui/scroll.js
@ -28,6 +28,7 @@ function scrollck() {
 		var scrt = $(this).find(".tl").height() - $(window).height();
 		var scr = $(this).scrollTop();
 		if (scr > scrt) {
+			console.log("kicked");
 			moreload('', tlid);
 		}
 	});
--- a/app/js/ui/settings.js
+++ b/app/js/ui/settings.js
@ -143,6 +143,13 @@ function settings() {
 	}
 	localStorage.setItem("ticker_ok", tckrd);

+	var animed = $("[name=anime]:checked").val();
+	var animet = $("[for=anime_"+animed+"]").text();
+	if (animed != localStorage.getItem("animation")) {
+		Materialize.toast(lang.lang_setting_animation.replace("{{set}}" ,animet), 3000);
+	}
+	localStorage.setItem("animation", animed);
+
 	var boxd = $("[name=box]:checked").val();
 	var boxt = $("[for=bx_"+boxd+"]").text();
 	if (boxd != localStorage.getItem("box")) {
@ -363,6 +370,12 @@ function load() {
 	}
 	$("#ticker_" + ticker).prop("checked", true);

+	var animation = localStorage.getItem("animation");
+	if (!animation) {
+		var animation = "yes";
+	}
+	$("#anime_" + animation).prop("checked", true);
+
 	var tag = localStorage.getItem("tag-range");
 	if (!tag) {
 		var tag = "all";
--- a/app/main.js
+++ b/app/main.js
@ -8,15 +8,10 @@ var Jimp = require("jimp");
 const shell = electron.shell;
 const os = require('os')
 const path = require('path')
-//const fm = require('font-manager');
+const fm = require('font-manager');
 const Menu=electron.Menu
 var updatewin=null;
 const join = require('path').join;
-// linuxの時は定義しない
-/*if (process.platform=='win32') {
-  const {NowPlaying,PlayerName} = require("nowplaying-node");
-}
-*/
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
 // ウィンドウを作成するモジュール
@ -376,9 +371,11 @@ function about(){
 	   window.loadURL('file://' + __dirname + '/about.html?ver='+ver);
 	   return "true"
 }
+
 ipc.on('itunes', (e, args) => {
+	console.log("Access");
 	if(args[0]=="set"){
-		return;
+		var {NowPlaying,PlayerName} = require("nowplaying-node");
 		var nppath=join(app.getPath("userData"), "nowplaying");
 		var npProvider;
 		try {
@ -403,7 +400,7 @@ ipc.on('itunes', (e, args) => {
 			console.log(error);
 		});
 		}else{
-			return;
+			var {NowPlaying,PlayerName} = require("nowplaying-node");
 			var nppath=join(app.getPath("userData"), "nowplaying");
 			var npProvider;
 			try {
--- a/app/package-lock.json
+++ b/app/package-lock.json
@ -7,14 +7,12 @@
    "@types/node": {
      "version": "10.12.29",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.29.tgz",
-      "integrity": "sha512-J/tnbnj8HcsBgCe2apZbdUpQ7hs4d7oZNTYA5bekWdP0sr2NGsOpI/HRdDroEi209tEvTcTtxhD0FfED3DhEcw==",
-      "dev": true
+      "integrity": "sha512-J/tnbnj8HcsBgCe2apZbdUpQ7hs4d7oZNTYA5bekWdP0sr2NGsOpI/HRdDroEi209tEvTcTtxhD0FfED3DhEcw=="
    },
    "abbrev": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-      "dev": true
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
    },
    "ajv": {
      "version": "5.5.2",
@ -30,8 +28,7 @@
    "ansi-regex": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "dev": true
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
    },
    "ansi-styles": {
      "version": "3.2.1",
@ -45,14 +42,12 @@
    "aproba": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-      "dev": true
+      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="
    },
    "are-we-there-yet": {
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-      "dev": true,
      "requires": {
        "delegates": "^1.0.0",
        "readable-stream": "^2.0.6"
@ -129,8 +124,7 @@
    "balanced-match": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
    },
    "base64-js": {
      "version": "1.3.0",
@ -166,7 +160,6 @@
      "version": "0.0.9",
      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
      "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
-      "dev": true,
      "requires": {
        "inherits": "~2.0.0"
      }
@ -194,7 +187,6 @@
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
      "requires": {
        "balanced-match": "^1.0.0",
        "concat-map": "0.0.1"
@ -246,9 +238,9 @@
      "dev": true
    },
    "camelcase": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
-      "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.1.0.tgz",
+      "integrity": "sha512-WP9f9OBL/TAbwOFBJL79FoS9UKUmnp82RWnhlwTgrAJeMq7lytHhe0Jzc6/P7Zq0+2oviXJuPlvkZalWUug9gg==",
      "dev": true
    },
    "camelcase-keys": {
@ -310,9 +302,9 @@
      }
    },
    "cli-spinners": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
-      "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.0.0.tgz",
+      "integrity": "sha512-yiEBmhaKPPeBj7wWm4GEdtPZK940p9pl3EANIrnJ3JnvWyrPjcFcsEq6qRUuQ7fzB0+Y82ld3p6B34xo95foWw==",
      "dev": true
    },
    "cliui": {
@ -373,8 +365,7 @@
    "code-point-at": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
    },
    "color-convert": {
      "version": "1.9.3",
@ -420,8 +411,7 @@
    "concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
    },
    "concat-stream": {
      "version": "1.6.2",
@ -438,8 +428,7 @@
    "console-control-strings": {
      "version": "1.1.0",
      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
+      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
    },
    "core-util-is": {
      "version": "1.0.2",
@ -578,8 +567,7 @@
    "delegates": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-      "dev": true
+      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
    },
    "detect-libc": {
      "version": "1.0.3",
@ -1173,6 +1161,14 @@
        }
      }
    },
+    "font-manager": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/font-manager/-/font-manager-0.3.0.tgz",
+      "integrity": "sha512-6N3pzO+9kxE3yD9c4VN7reg5fqgFvjcUdxZmwauRzsExaeKRu0APfEi3DOISFakokybgKlZcLFQHawwc2TMpQQ==",
+      "requires": {
+        "nan": ">=2.10.0"
+      }
+    },
    "for-each": {
      "version": "0.3.2",
      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.2.tgz",
@ -1210,14 +1206,12 @@
    "fs.realpath": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
    },
    "fstream": {
      "version": "1.0.11",
      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
-      "dev": true,
      "requires": {
        "graceful-fs": "^4.1.2",
        "inherits": "~2.0.0",
@ -1277,7 +1271,6 @@
      "version": "2.7.4",
      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
      "requires": {
        "aproba": "^1.0.3",
        "console-control-strings": "^1.0.0",
@ -1393,7 +1386,6 @@
      "version": "7.1.3",
      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
      "requires": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@ -1415,8 +1407,7 @@
    "graceful-fs": {
      "version": "4.1.15",
      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-      "dev": true
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
    },
    "growly": {
      "version": "1.3.0",
@ -1446,8 +1437,7 @@
    "has-unicode": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-      "dev": true
+      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
    },
    "hawk": {
      "version": "6.0.2",
@ -1500,7 +1490,6 @@
      "version": "1.0.6",
      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
      "requires": {
        "once": "^1.3.0",
        "wrappy": "1"
@ -1509,8 +1498,7 @@
    "inherits": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-      "dev": true
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
    },
    "ini": {
      "version": "1.3.5",
@ -1557,7 +1545,6 @@
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true,
      "requires": {
        "number-is-nan": "^1.0.0"
      }
@ -1592,8 +1579,7 @@
    "isarray": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
    },
    "isbinaryfile": {
      "version": "3.0.3",
@ -1870,7 +1856,6 @@
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
      "requires": {
        "brace-expansion": "^1.1.7"
      }
@ -1939,6 +1924,11 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
    },
+    "nan": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
+      "integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
+    },
    "nice-try": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
@ -1954,11 +1944,15 @@
        "semver": "^5.4.1"
      }
    },
+    "node-addon-api": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.6.2.tgz",
+      "integrity": "sha512-479Bjw9nTE5DdBSZZWprFryHGjUaQC31y1wHo19We/k0BZlrmhqQitWoUL0cD8+scljCbIUL+E58oRDEakdGGA=="
+    },
    "node-gyp": {
      "version": "3.8.0",
      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
-      "dev": true,
      "requires": {
        "fstream": "^1.0.0",
        "glob": "^7.0.3",
@ -1975,10 +1969,9 @@
      },
      "dependencies": {
        "ajv": {
-          "version": "6.6.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz",
-          "integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==",
-          "dev": true,
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
          "requires": {
            "fast-deep-equal": "^2.0.1",
            "fast-json-stable-stringify": "^2.0.0",
@ -1989,26 +1982,22 @@
        "aws4": {
          "version": "1.8.0",
          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-          "dev": true
+          "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
        },
        "extend": {
          "version": "3.0.2",
          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-          "dev": true
+          "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
        },
        "fast-deep-equal": {
          "version": "2.0.1",
          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-          "dev": true
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
        },
        "har-validator": {
          "version": "5.1.3",
          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
          "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-          "dev": true,
          "requires": {
            "ajv": "^6.5.5",
            "har-schema": "^2.0.0"
@ -2017,41 +2006,35 @@
        "json-schema-traverse": {
          "version": "0.4.1",
          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
        },
        "mime-db": {
-          "version": "1.37.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
-          "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
-          "dev": true
+          "version": "1.38.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
+          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg=="
        },
        "mime-types": {
-          "version": "2.1.21",
-          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
-          "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
-          "dev": true,
+          "version": "2.1.22",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz",
+          "integrity": "sha512-aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==",
          "requires": {
-            "mime-db": "~1.37.0"
+            "mime-db": "~1.38.0"
          }
        },
        "oauth-sign": {
          "version": "0.9.0",
          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-          "dev": true
+          "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
        },
        "qs": {
          "version": "6.5.2",
          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-          "dev": true
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
        },
        "request": {
          "version": "2.88.0",
          "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
          "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-          "dev": true,
          "requires": {
            "aws-sign2": "~0.7.0",
            "aws4": "^1.8.0",
@ -2078,20 +2061,17 @@
        "safe-buffer": {
          "version": "5.1.2",
          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
        },
        "semver": {
          "version": "5.3.0",
          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true
+          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
        },
        "tough-cookie": {
          "version": "2.4.3",
          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "dev": true,
          "requires": {
            "psl": "^1.1.24",
            "punycode": "^1.4.1"
@ -2100,8 +2080,7 @@
        "uuid": {
          "version": "3.3.2",
          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
-          "dev": true
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
        }
      }
    },
@ -2120,7 +2099,6 @@
      "version": "3.0.6",
      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
      "requires": {
        "abbrev": "1"
      }
@ -2137,6 +2115,16 @@
        "validate-npm-package-license": "^3.0.1"
      }
    },
+    "nowplaying-node": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/nowplaying-node/-/nowplaying-node-0.1.3.tgz",
+      "integrity": "sha512-nEvuw93xmgZS7X1XqUaLJXhd4iB54xjTOnYuEEoPMBHHs3QWGECNKvnD0uDBCe269sUK8Z5InX5rPjzf3vRVrw==",
+      "requires": {
+        "@types/node": "^10.1.2",
+        "node-addon-api": "^1.2.0",
+        "node-gyp": "^3.6.2"
+      }
+    },
    "npm-run-path": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
@ -2150,7 +2138,6 @@
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-      "dev": true,
      "requires": {
        "are-we-there-yet": "~1.1.2",
        "console-control-strings": "~1.1.0",
@ -2184,8 +2171,7 @@
    "number-is-nan": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
    },
    "oauth-sign": {
      "version": "0.8.2",
@ -2195,8 +2181,7 @@
    "object-assign": {
      "version": "4.1.1",
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
    },
    "object-keys": {
      "version": "0.4.0",
@ -2208,7 +2193,6 @@
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
      "requires": {
        "wrappy": "1"
      }
@ -2223,14 +2207,14 @@
      }
    },
    "ora": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-3.1.0.tgz",
-      "integrity": "sha512-vRBPaNCclUi8pUxRF/G8+5qEQkc6EgzKK1G2ZNJUIGu088Un5qIxFXeDgymvPRM9nmrcUOGzQgS1Vmtz+NtlMw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-3.2.0.tgz",
+      "integrity": "sha512-XHMZA5WieCbtg+tu0uPF8CjvwQdNzKCX6BVh3N6GFsEXH40mTk5dsw/ya1lBTUGJslcEFJFQ8cBhOgkkZXQtMA==",
      "dev": true,
      "requires": {
        "chalk": "^2.4.2",
        "cli-cursor": "^2.1.0",
-        "cli-spinners": "^1.3.1",
+        "cli-spinners": "^2.0.0",
        "log-symbols": "^2.2.0",
        "strip-ansi": "^5.0.0",
        "wcwidth": "^1.0.1"
@ -2256,8 +2240,7 @@
    "os-homedir": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
    },
    "os-locale": {
      "version": "3.1.0",
@ -2273,14 +2256,12 @@
    "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=",
-      "dev": true
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
    },
    "osenv": {
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "dev": true,
      "requires": {
        "os-homedir": "^1.0.0",
        "os-tmpdir": "^1.0.0"
@ -2382,8 +2363,7 @@
    "path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
    },
    "path-key": {
      "version": "2.0.1",
@ -2482,8 +2462,7 @@
    "process-nextick-args": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-      "dev": true
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
    },
    "progress-stream": {
      "version": "1.2.0",
@ -2496,10 +2475,9 @@
      }
    },
    "psl": {
-      "version": "1.1.29",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
-      "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
-      "dev": true
+      "version": "1.1.31",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+      "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="
    },
    "pump": {
      "version": "3.0.0",
@ -2588,7 +2566,6 @@
      "version": "2.3.6",
      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-      "dev": true,
      "requires": {
        "core-util-is": "~1.0.0",
        "inherits": "~2.0.3",
@ -2682,7 +2659,6 @@
      "version": "2.6.2",
      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
-      "dev": true,
      "requires": {
        "glob": "^7.0.5"
      }
@ -2723,8 +2699,7 @@
    "set-blocking": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
    },
    "shebang-command": {
      "version": "1.2.0",
@ -2749,8 +2724,7 @@
    "signal-exit": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
    },
    "single-line-log": {
      "version": "1.1.2",
@ -2866,7 +2840,6 @@
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true,
      "requires": {
        "code-point-at": "^1.0.0",
        "is-fullwidth-code-point": "^1.0.0",
@ -2877,7 +2850,6 @@
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
      "requires": {
        "safe-buffer": "~5.1.0"
      }
@ -2891,7 +2863,6 @@
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
      "requires": {
        "ansi-regex": "^2.0.0"
      }
@ -2947,7 +2918,6 @@
      "version": "2.2.1",
      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
-      "dev": true,
      "requires": {
        "block-stream": "*",
        "fstream": "^1.0.2",
@ -3118,7 +3088,6 @@
      "version": "4.2.2",
      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
      "requires": {
        "punycode": "^2.1.0"
      },
@ -3126,8 +3095,7 @@
        "punycode": {
          "version": "2.1.1",
          "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-          "dev": true
+          "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
        }
      }
    },
@ -3148,8 +3116,7 @@
    "util-deprecate": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
    },
    "uuid": {
      "version": "3.2.1",
@ -3203,7 +3170,6 @@
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-      "dev": true,
      "requires": {
        "string-width": "^1.0.2 || 2"
      }
@ -3221,8 +3187,7 @@
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
    },
    "xhr": {
      "version": "2.4.1",
@ -3323,9 +3288,9 @@
          }
        },
        "p-limit": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
-          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
          "dev": true,
          "requires": {
            "p-try": "^2.0.0"
--- a/app/package.json
+++ b/app/package.json
@ -35,8 +35,10 @@
  "license": "GPL-3.0",
  "dependencies": {
    "electron-dl": "^1.11.0",
+    "font-manager": "^0.3.0",
    "jimp": "^0.2.28",
    "node-notifier": "^5.2.1",
+    "nowplaying-node": "^0.1.3",
    "sumchecker": "^2.0.2"
  },
  "optionalDependencies": {
--- a/app/view/en/index.html
+++ b/app/view/en/index.html
@ -53,8 +53,10 @@ var tlid=0;
 </div>
 </div>
 </div>
-<div id="post-box" class="z-depth-3">
+<div id="post-box" class="z-depth-5">
+<div id="post-bar">Post new</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@ -185,6 +187,9 @@ var tlid=0;
 	<li>
 		<a onclick="schedule();">Scheduled toot</a>
 	</li>
+	<li>
+		<a onclick="pollToggle();">Poll</a>
+	</li>
 	</ul>
 <!--hidden area-->
 <input type="hidden" id="reply">
@ -196,8 +201,9 @@ var tlid=0;
 	<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="Secondary Toot">lock_open</i></button>
 </div>
 </div>
+<div id="right-side">
 <!--絵文字ピッカー-->
-<div id="emoji" class="hide shared z-depth-4">
+<div id="emoji" class="hide">
 		<span class="gray sml">
 			<a onclick="emojiGet('true')" class="pointer">Refresh emojis list</a>
 			<i class="material-icons waves-effect" onclick="emojiToggle()" title="Close this box" data-trans-title="post_box_close">cancel</i>
@ -249,6 +255,30 @@ var tlid=0;
 			<i class="fa fa-fort-awesome"></i>
 			</a>
 		</div>
+	</div>
+	<!--Poll UI-->
+	<div id="poll" class="hide">
+		<select id="poll-sel"  onchange="pollProviderCk()">
+			<option value="nothing">Polls: Disabled</option>
+			<option value="votedon">votedon.</option>
+			<option value="mastodon-poll">Mastodon(2.8~)</option>
+		</select>
+		<div id="votedon">
+	
+		</div>
+		<div id="mastodon-poll" class="poll-provider hide">
+			<input type="text" class="mastodon-choice" placeholder="Choice1">
+			<input type="text" class="mastodon-choice" placeholder="Choice2">
+			<input type="text" class="mastodon-choice" placeholder="Choice3">
+			<input type="text" class="mastodon-choice" placeholder="Choice4">
+			<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+			<label for="poll-multiple">Multiple select</label><br>
+			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">days
+			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">hours
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">minutes
+		</div>
+	</div>
+</div>
 </div>
 <!-- Modal Structure Tootdata-->
 <div id="tootmodal" class="modal modal-fixed-footer">
@ -709,9 +739,9 @@ var tlid=0;
 	  <label for="except_filter">Drop instead of hide</label><br>
 	<span class="sml">Filtered toots will disappear irreversibly, even if filter is later removed</span><br>
 	Expire after<span class="sml">Unset or "0" means "Never"<b>This value may contain some error</b></span><br><br>
-	<input type="text" style="width:50px" id="days_filter" placeholder="d" value="0">days
-	<input type="text" style="width:50px" id="hours_filter" placeholder="h" value="0">hours
-	<input type="text" style="width:50px" id="mins_filter" placeholder="m" value="0">minutes
+	<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">days
+	<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">hours
+	<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">minutes
 	<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">Add</button><br>
 	<span class="sml">Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.</span>
 </div>
@ -726,7 +756,9 @@ var tlid=0;
 <div id="bottom" class="reverse">
    <div class="leftside reverse">
        <div id="dambox">
-                <input type="text" id="posttgl" placeholder="Toot" style="height:2rem">
+								<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
+									<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>Toot
+								</button>
        </div>
        <div class="leftside reverse" id="group">
            <div class="btnsgroup"><span class="grouptitle">Columns:</span>
@ -812,9 +844,11 @@ var tlid=0;
 <script type="text/javascript" src="../../js/common/about.js"></script>
 <script type="text/javascript" src="../../js/tl/parse.js"></script>
 <script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
+<script type="text/javascript" src="../../js/tl/dm.js"></script>
 <script type="text/javascript" src="../../js/ui/scroll.js"></script>
 <script type="text/javascript" src="../../js/tl/tl.js"></script>
 <script type="text/javascript" src="../../js/tl/card.js"></script>
+<script type="text/javascript" src="../../js/tl/poll.js"></script>
 <script type="text/javascript" src="../../js/tl/date.js"></script>
 <script type="text/javascript" src="../../js/tl/notification.js"></script>
 <script type="text/javascript" src="../../js/tl/datails.js"></script>
--- a/app/view/en/setting.html
+++ b/app/view/en/setting.html
@ -71,9 +71,7 @@
 		<h5>Font</h5>
 		Select your favorite font to 'Select'<br>
 		<button class="btn waves-effect" style="width:100px;" onclick="font()">Select</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;">
-
-		</div>
+		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
 		<br>
 		<input type="text" style="width:150px" id="font">
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">Save</button>
@ -184,6 +182,11 @@
 		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
 		<label for="ticker_no">No</label>
 		<br>
+		<h5>Animation of timelines</h5>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_yes" value="yes" />
+		<label for="anime_yes">Yes</label>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
+		<label for="anime_no">No</label>
 	</div>
 	</li>
 	<li>
@ -320,7 +323,7 @@
 		</div>
 		<div class="collapsible-body">
 			<!-->h5>NowPlaying Provider(Windows)</h5>
-			macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required.<br>
+			macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a> is required. And MusicBee requires CAD.<br>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
 			<label for="aimp">AIMP</label>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
@ -427,7 +430,7 @@ Kyash<br>
 <a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">Check update</a><br>
 <a href="oss.html">OSS License</a><br>
 <span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://github.com/cutls/TheDesk/blob/master/TOS.md">Terms of Use</a>
+	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
 	<br>Developer: Cutls P( 
 	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 	<br>
--- a/app/view/ja/index.html
+++ b/app/view/ja/index.html
@ -53,8 +53,10 @@ var tlid=0;
 </div>
 </div>
 </div>
-<div id="post-box" class="z-depth-3">
+<div id="post-box" class="z-depth-5">
+<div id="post-bar">投稿</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@ -185,6 +187,9 @@ var tlid=0;
 	<li>
 		<a onclick="schedule();">時間指定投稿</a>
 	</li>
+	<li>
+		<a onclick="pollToggle();">アンケート</a>
+	</li>
 	</ul>
 <!--hidden area-->
 <input type="hidden" id="reply">
@ -196,8 +201,9 @@ var tlid=0;
 	<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="セカンダリートゥート">lock_open</i></button>
 </div>
 </div>
+<div id="right-side">
 <!--絵文字ピッカー-->
-<div id="emoji" class="hide shared z-depth-4">
+<div id="emoji" class="hide">
 		<span class="gray sml">サーバーによって実装が異なります。
 			<a onclick="emojiGet('true')" class="pointer">絵文字更新</a>
 			<i class="material-icons waves-effect" onclick="emojiToggle()" title="このボックスを閉じる" data-trans-title="post_box_close">cancel</i>
@ -249,6 +255,30 @@ var tlid=0;
 			<i class="fa fa-fort-awesome"></i>
 			</a>
 		</div>
+	</div>
+	<!--Poll UI-->
+	<div id="poll" class="hide">
+		<select id="poll-sel"  onchange="pollProviderCk()">
+			<option value="nothing">アンケートを使用しない</option>
+			<option value="votedon">votedon.</option>
+			<option value="mastodon-poll">Mastodon(2.8~)</option>
+		</select>
+		<div id="votedon">
+	
+		</div>
+		<div id="mastodon-poll" class="poll-provider hide">
+			<input type="text" class="mastodon-choice" placeholder="選択肢1">
+			<input type="text" class="mastodon-choice" placeholder="選択肢2">
+			<input type="text" class="mastodon-choice" placeholder="選択肢3">
+			<input type="text" class="mastodon-choice" placeholder="選択肢4">
+			<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+			<label for="poll-multiple">複数選択を許可</label><br>
+			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">日
+			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">時間
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">分
+		</div>
+	</div>
+</div>
 </div>
 <!-- Modal Structure Tootdata-->
 <div id="tootmodal" class="modal modal-fixed-footer">
@ -709,9 +739,9 @@ var tlid=0;
 	  <label for="except_filter">除外</label><br>
 	<span class="sml">「除外」時マッチしたトゥートは非可逆的に除外され、削除後も閲覧できません。</span><br>
 	有効期限(あと)<span class="sml">未指定(または0分)で「無制限」になります。<b>仕様上数値の正確性を保証できません。</b></span><br><br>
-	<input type="text" style="width:50px" id="days_filter" placeholder="d" value="0">日
-	<input type="text" style="width:50px" id="hours_filter" placeholder="h" value="0">時間
-	<input type="text" style="width:50px" id="mins_filter" placeholder="m" value="0">分
+	<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">日
+	<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">時間
+	<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">分
 	<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">追加</button><br>
 	<span class="sml">Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。</span>
 </div>
@ -726,7 +756,9 @@ var tlid=0;
 <div id="bottom" class="reverse">
    <div class="leftside reverse">
        <div id="dambox">
-                <input type="text" id="posttgl" placeholder="トゥート" style="height:2rem">
+								<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
+									<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>トゥート
+								</button>
        </div>
        <div class="leftside reverse" id="group">
            <div class="btnsgroup"><span class="grouptitle">Columns:</span>
@ -812,9 +844,11 @@ var tlid=0;
 <script type="text/javascript" src="../../js/common/about.js"></script>
 <script type="text/javascript" src="../../js/tl/parse.js"></script>
 <script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
+<script type="text/javascript" src="../../js/tl/dm.js"></script>
 <script type="text/javascript" src="../../js/ui/scroll.js"></script>
 <script type="text/javascript" src="../../js/tl/tl.js"></script>
 <script type="text/javascript" src="../../js/tl/card.js"></script>
+<script type="text/javascript" src="../../js/tl/poll.js"></script>
 <script type="text/javascript" src="../../js/tl/date.js"></script>
 <script type="text/javascript" src="../../js/tl/notification.js"></script>
 <script type="text/javascript" src="../../js/tl/datails.js"></script>
--- a/app/view/ja/setting.html
+++ b/app/view/ja/setting.html
@ -71,9 +71,7 @@
 		<h5>フォント</h5>
 		「選択」を押してフォントを選んでください。<br>
 		<button class="btn waves-effect" style="width:100px;" onclick="font()">選択</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;">
-
-		</div>
+		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
 		<br>
 		<input type="text" style="width:150px" id="font">
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">設定</button>
@ -184,6 +182,11 @@
 		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
 		<label for="ticker_no">いいえ</label>
 		<br>
+		<h5>タイムラインのアニメーション</h5>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_yes" value="yes" />
+		<label for="anime_yes">はい</label>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
+		<label for="anime_no">いいえ</label>
 	</div>
 	</li>
 	<li>
@ -320,7 +323,7 @@
 		</div>
 		<div class="collapsible-body">
 			<!-->h5>NowPlayingのソース(Windows)</h5>
-			macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a>が必要です。<br>
+			macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href="http://poiru.github.com/foo-cad/">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。<br>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="aimp" value="AIMP" />
 			<label for="aimp">AIMP</label>
 			<input class="with-gap" onchange="npprovider()" name="npp" type="radio" id="itunes" value="ITUNES" />
@ -427,7 +430,7 @@ Kyash<br>
 <a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">アップデートを確認</a><br>
 <a href="oss.html">OSS License(オープンソースライセンス)</a><br>
 <span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://github.com/cutls/TheDesk/blob/master/TOS.md">Terms of Use</a>
+	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
 	<br>Developer: Cutls P( 
 	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 	<br>
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@ -53,8 +53,10 @@ var tlid=0;
 </div>
 </div>
 </div>
-<div id="post-box" class="z-depth-3">
+<div id="post-box" class="z-depth-5">
+<div id="post-bar">{{post-new}}</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@ -185,6 +187,9 @@ var tlid=0;
 	<li>
 		<a onclick="schedule();">{{schedule}}</a>
 	</li>
+	<li>
+		<a onclick="pollToggle();">{{poll}}</a>
+	</li>
 	</ul>
 <!--hidden area-->
 <input type="hidden" id="reply">
@ -196,8 +201,9 @@ var tlid=0;
 	<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="{{sectoot}}">lock_open</i></button>
 </div>
 </div>
+<div id="right-side">
 <!--絵文字ピッカー-->
-<div id="emoji" class="hide shared z-depth-4">
+<div id="emoji" class="hide">
 		<span class="gray sml">{{emojiWarn}}
 			<a onclick="emojiGet('true')" class="pointer">{{refreshEmoji}}</a>
 			<i class="material-icons waves-effect" onclick="emojiToggle()" title="{{closeThisBox}}" data-trans-title="post_box_close">cancel</i>
@ -249,6 +255,30 @@ var tlid=0;
 			<i class="fa fa-fort-awesome"></i>
 			</a>
 		</div>
+	</div>
+	<!--Poll UI-->
+	<div id="poll" class="hide">
+		<select id="poll-sel"  onchange="pollProviderCk()">
+			<option value="nothing">{{pollDdisabled}}</option>
+			<option value="votedon">votedon.</option>
+			<option value="mastodon-poll">Mastodon(2.8~)</option>
+		</select>
+		<div id="votedon">
+	
+		</div>
+		<div id="mastodon-poll" class="poll-provider hide">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}1">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}2">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}3">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}4">
+			<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+			<label for="poll-multiple">{{pollmulti}}</label><br>
+			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">{{days}}
+			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">{{hours}}
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">{{mins}}
+		</div>
+	</div>
+</div>
 </div>
 <!-- Modal Structure Tootdata-->
 <div id="tootmodal" class="modal modal-fixed-footer">
@ -709,9 +739,9 @@ var tlid=0;
 	  <label for="except_filter">{{except}}</label><br>
 	<span class="sml">{{exceptWorn}}</span><br>
 	{{avalableBefore}}<span class="sml">{{warnAvBefore}}<b>{{warnAvBefore2}}</b></span><br><br>
-	<input type="text" style="width:50px" id="days_filter" placeholder="d" value="0">{{days}}
-	<input type="text" style="width:50px" id="hours_filter" placeholder="h" value="0">{{hours}}
-	<input type="text" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}
+	<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">{{days}}
+	<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">{{hours}}
+	<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">{{mins}}
 	<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">{{add}}</button><br>
 	<span class="sml">{{warnOnIntegratedTL}}</span>
 </div>
@ -726,7 +756,9 @@ var tlid=0;
 <div id="bottom" class="reverse">
    <div class="leftside reverse">
        <div id="dambox">
-                <input type="text" id="posttgl" placeholder="{{toot}}" style="height:2rem">
+								<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
+									<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>{{toot}}
+								</button>
        </div>
        <div class="leftside reverse" id="group">
            <div class="btnsgroup"><span class="grouptitle">Columns:</span>
@ -812,9 +844,11 @@ var tlid=0;
 <script type="text/javascript" src="../../js/common/about.js"></script>
 <script type="text/javascript" src="../../js/tl/parse.js"></script>
 <script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
+<script type="text/javascript" src="../../js/tl/dm.js"></script>
 <script type="text/javascript" src="../../js/ui/scroll.js"></script>
 <script type="text/javascript" src="../../js/tl/tl.js"></script>
 <script type="text/javascript" src="../../js/tl/card.js"></script>
+<script type="text/javascript" src="../../js/tl/poll.js"></script>
 <script type="text/javascript" src="../../js/tl/date.js"></script>
 <script type="text/javascript" src="../../js/tl/notification.js"></script>
 <script type="text/javascript" src="../../js/tl/datails.js"></script>
--- a/app/view/make/language/index.en.json
+++ b/app/view/make/language/index.en.json
@ -4,6 +4,7 @@
    "showSelectProf":"Show profile of the selecting account",
    "closethisbox":"Close this box",
    "toot":"Toot",
+    "post-new":"Post new",
    "nsfwDes":"Mark media as sensitive",
    "cwDes":"Hide text behind warning",
    "selfile":"Attach..",
@ -43,6 +44,12 @@
    "thingsEmoji":"Emojis of tools",
    "symbolEmoji":"Emojis of symbols",
    "flagsEmoji":"Emojis of flags",
+    "poll":"Poll",
+    "pollDdisabled":"Polls: Disabled",
+    "pollProvider":"Provider of Poll",
+    "choice":"Choice",
+    "pollmulti":"Multiple select",
+    "expires_in":"Expires in...(sec)",
    "contextBefore":"Context before this toot",
    "thisToot":"This toot",
    "contextAfter":"Context after this toot",
@ -131,6 +138,7 @@
    "days":"days",
    "hours":"hours",
    "mins":"minutes",
+    "secs":"seconds",
    "warnOnIntegratedTL":"Integrated TL/Plus TL will hide both Home-filtering words and Local-filtering words.",
    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">Add an account</a> or click <i class=\"material-icons\">add</i> to add a column.",
    "addColumn":"Add a column",
--- a/app/view/make/language/index.ja.json
+++ b/app/view/make/language/index.ja.json
@ -3,6 +3,7 @@
    "close":"Close",
    "showSelectProf":"選択したアカウントのプロフィールを表示",
    "closethisbox":"このボックスを閉じる",
+    "post-new":"投稿",
    "toot":"トゥート",
    "nsfwDes":"画像に制限を付与",
    "cwDes":"コンテンツワーニング(トゥートを表示する前にメッセージで隠す)",
@ -43,6 +44,12 @@
    "thingsEmoji":"もの",
    "symbolEmoji":"記号",
    "flagsEmoji":"国旗",
+    "poll":"アンケート",
+    "pollDdisabled":"アンケートを使用しない",
+    "pollProvider":"アンケートのプロバイダ",
+    "choice":"選択肢",
+    "pollmulti":"複数選択を許可",
+    "expires_in":"有効期限(秒)",
    "contextBefore":"これより前の会話",
    "thisToot":"対象のトゥート",
    "contextAfter":"これより後の会話",
@ -131,6 +138,7 @@
    "days":"日",
    "hours":"時間",
    "mins":"分",
+    "secs":"秒",
    "warnOnIntegratedTL":"Integrated TL/Plus TLは、公開/ホームのフィルターワードが合算されて適応されます。どちらか一方の指定でも非表示になります。",
    "helloTheDesk":"<h3>Welcome to TheDesk</h3><br><a href=\"acct.html\">アカウントを追加</a>するか下の<i class=\"material-icons\">add</i>ボタンよりカラムを追加してください。",
    "addColumn":"カラム追加",
--- a/app/view/make/language/setting.en.json
+++ b/app/view/make/language/setting.en.json
@ -67,6 +67,7 @@
    "imgheight":"Height of images",
    "ticker":"Enable #InstanceTicker",
    "tickerwarn":"Show colorful stickers about tooters' server. <a href=\"https://cdn.weep.me/mastodon/\">About #InstanceTicker</a> Copyright 2018 weepjp, kyori19.",
+    "animation":"Animation of timelines",
    "post":"Posting Preferences",
    "autocw":"Alert before posting a long toot.",
    "autocwwarn":"Show dialog whether you make too-long text hidden.",
@ -110,7 +111,7 @@
    "empcolorwarn":"Use this color to emphasis",
    "spotify":"Spotify and NowPlaying Preferences",
    "npProvider":"NowPlaying Provider(Windows)",
-    "npPeoviderWarn":"macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a> is required.",
+    "npPeoviderWarn":"macOS and Linux are not supported. AIMP and iTunes were checked by developer. <br>CAD:foobar2000, MusicBee,J. River Media Center, Media Jukebox<br>WLM:Last.fm Client, TTPlayer, OpenPandora, Zune.<br> For foobar2000, <a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a> is required. And MusicBee requires CAD.",
    "spotifynote1":"Click ",
    "spotifynote2":"icon to NowPlaying",
    "link":"Account Connection",
--- a/app/view/make/language/setting.ja.json
+++ b/app/view/make/language/setting.ja.json
@ -67,6 +67,7 @@
    "imgheight":"画像の高さ",
    "ticker":"#InstanceTickerを使う",
    "tickerwarn":"トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://cdn.weep.me/mastodon/\">#InstanceTickerについて</a> Copyright 2018 weepjp, kyori19.",
+    "animation":"タイムラインのアニメーション",
    "post":"投稿設定",
    "autocw":"長文投稿時に警告",
    "autocwwarn":"下で指定した以上のトゥートを投稿するときにCWするかのダイアログを表示します。",
@ -110,7 +111,7 @@
    "empcolorwarn":"強調色(テーマによって異なります。)",
    "spotify":"SpotifyとNowPlayingの設定",
    "npProvider":"NowPlayingのソース(Windows)",
-    "npPeoviderWarn":"macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a>が必要です。",
+    "npPeoviderWarn":"macOSやLinuxでは動作しません。AIMPとiTunes以外未検証です。<br>foobar2000, MusicBee,J. River Media Center, Media JukeboxはCADを、Last.fm Client, TTPlayer, OpenPandora, ZuneはWLMを選んでください。<br>ただし、foobar2000は<a href=\"http://poiru.github.com/foo-cad/\">foo_cad plugin</a>が必要です。MusicBeeもCADを有効にする必要があります。",
    "spotifynote1":"",
    "spotifynote2":"ボタンから簡単にNowPlayingができます。",
    "link":"アカウントの連携",
--- a/app/view/make/setting.sample.html
+++ b/app/view/make/setting.sample.html
@ -71,9 +71,7 @@
 		<h5>{{font}}</h5>
 		{{fontwarn}}<br>
 		<button class="btn waves-effect" style="width:100px;" onclick="font()">{{select}}</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;">
-
-		</div>
+		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
 		<br>
 		<input type="text" style="width:150px" id="font">
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">{{set}}</button>
@ -184,6 +182,11 @@
 		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
 		<label for="ticker_no">{{no}}</label>
 		<br>
+		<h5>{{animation}}</h5>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_yes" value="yes" />
+		<label for="anime_yes">{{yes}}</label>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
+		<label for="anime_no">{{no}}</label>
 	</div>
 	</li>
 	<li>
@ -427,7 +430,7 @@ Kyash<br>
 <a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">{{checkup}}</a><br>
 <a href="oss.html">OSS License{{ossJP}}</a><br>
 <span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://github.com/cutls/TheDesk/blob/master/TOS.md">Terms of Use</a>
+	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
 	<br>Developer: Cutls P( 
 	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 	<br>
--- a/app/view/ps/index.html
+++ b/app/view/ps/index.html
@ -53,8 +53,10 @@ var tlid=0;
 </div>
 </div>
 </div>
-<div id="post-box" class="z-depth-3">
+<div id="post-box" class="z-depth-5">
+<div id="post-bar">{{post-new}}</div>
 <!--トゥートボックス-->
+<div id="left-side">
 <div class="row" style="margin-bottom:0;">
 </span>
 <div class="" style="float:left;">
@ -185,6 +187,9 @@ var tlid=0;
 	<li>
 		<a onclick="schedule();">crwdns1884:0crwdne1884:0</a>
 	</li>
+	<li>
+		<a onclick="pollToggle();">{{poll}}</a>
+	</li>
 	</ul>
 <!--hidden area-->
 <input type="hidden" id="reply">
@ -196,8 +201,9 @@ var tlid=0;
 	<button class="btn waves-effect indigo darken-3 unmize hide toot-btn-group" onclick="sec()" id="toot-sec-btn"><i class="material-icons" id="toot-sec-icon" title="crwdns1890:0crwdne1890:0">lock_open</i></button>
 </div>
 </div>
+<div id="right-side">
 <!--絵文字ピッカー-->
-<div id="emoji" class="hide shared z-depth-4">
+<div id="emoji" class="hide">
 		<span class="gray sml">crwdns409:0crwdne409:0
 			<a onclick="emojiGet('true')" class="pointer">crwdns411:0crwdne411:0</a>
 			<i class="material-icons waves-effect" onclick="emojiToggle()" title="crwdns412:0crwdne412:0" data-trans-title="post_box_close">cancel</i>
@ -249,6 +255,30 @@ var tlid=0;
 			<i class="fa fa-fort-awesome"></i>
 			</a>
 		</div>
+	</div>
+	<!--Poll UI-->
+	<div id="poll" class="hide">
+		<select id="poll-sel"  onchange="pollProviderCk()">
+			<option value="nothing">{{pollDdisabled}}</option>
+			<option value="votedon">votedon.</option>
+			<option value="mastodon-poll">Mastodon(2.8~)</option>
+		</select>
+		<div id="votedon">
+	
+		</div>
+		<div id="mastodon-poll" class="poll-provider hide">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}1">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}2">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}3">
+			<input type="text" class="mastodon-choice" placeholder="{{choice}}4">
+			<input type="checkbox" class="filled-in" id="poll-multiple" value="1" />
+			<label for="poll-multiple">{{pollmulti}}</label><br>
+			<input type="number" style="width:50px" id="days_poll" placeholder="d" value="0">crwdns507:0crwdne507:0
+			<input type="number" style="width:50px" id="hours_poll" placeholder="h" value="0">crwdns508:0crwdne508:0
+			<input type="number" style="width:50px" id="mins_poll" placeholder="m" value="0">crwdns509:0crwdne509:0
+		</div>
+	</div>
+</div>
 </div>
 <!-- Modal Structure Tootdata-->
 <div id="tootmodal" class="modal modal-fixed-footer">
@ -709,9 +739,9 @@ var tlid=0;
 	  <label for="except_filter">crwdns502:0crwdne502:0</label><br>
 	<span class="sml">crwdns503:0crwdne503:0</span><br>
 	crwdns504:0crwdne504:0<span class="sml">crwdns505:0crwdne505:0<b>crwdns506:0crwdne506:0</b></span><br><br>
-	<input type="text" style="width:50px" id="days_filter" placeholder="d" value="0">crwdns507:0crwdne507:0
-	<input type="text" style="width:50px" id="hours_filter" placeholder="h" value="0">crwdns508:0crwdne508:0
-	<input type="text" style="width:50px" id="mins_filter" placeholder="m" value="0">crwdns509:0crwdne509:0
+	<input type="number" style="width:50px" id="days_filter" placeholder="d" value="0">crwdns507:0crwdne507:0
+	<input type="number" style="width:50px" id="hours_filter" placeholder="h" value="0">crwdns508:0crwdne508:0
+	<input type="number" style="width:50px" id="mins_filter" placeholder="m" value="0">crwdns509:0crwdne509:0
 	<button class="btn waves-effect" style="width:120px;" onclick="makeNewFilter()" id="add-filter-btn">crwdns491:0crwdne491:0</button><br>
 	<span class="sml">crwdns510:0crwdne510:0</span>
 </div>
@ -726,7 +756,9 @@ var tlid=0;
 <div id="bottom" class="reverse">
    <div class="leftside reverse">
        <div id="dambox">
-                <input type="text" id="posttgl" placeholder="crwdns388:0crwdne388:0" style="height:2rem">
+								<button id="posttgl" class="btn waves-effect indigo" style="width: 100%;height: 2.5rem;line-height: 0;margin: 0;">
+									<i class="material-icons" style="position: relative; top: 5px; font-size: 1.5rem; text-align: center; margin-right: 10px;">edit</i>crwdns388:0crwdne388:0
+								</button>
        </div>
        <div class="leftside reverse" id="group">
            <div class="btnsgroup"><span class="grouptitle">Columns:</span>
@ -812,9 +844,11 @@ var tlid=0;
 <script type="text/javascript" src="../../js/common/about.js"></script>
 <script type="text/javascript" src="../../js/tl/parse.js"></script>
 <script type="text/javascript" src="../../js/tl/misskeyparse.js"></script>
+<script type="text/javascript" src="../../js/tl/dm.js"></script>
 <script type="text/javascript" src="../../js/ui/scroll.js"></script>
 <script type="text/javascript" src="../../js/tl/tl.js"></script>
 <script type="text/javascript" src="../../js/tl/card.js"></script>
+<script type="text/javascript" src="../../js/tl/poll.js"></script>
 <script type="text/javascript" src="../../js/tl/date.js"></script>
 <script type="text/javascript" src="../../js/tl/notification.js"></script>
 <script type="text/javascript" src="../../js/tl/datails.js"></script>
--- a/app/view/ps/setting.html
+++ b/app/view/ps/setting.html
@ -71,9 +71,7 @@
 		<h5>crwdns544:0crwdne544:0</h5>
 		crwdns1900:0crwdne1900:0<br>
 		<button class="btn waves-effect" style="width:100px;" onclick="font()">crwdns1896:0crwdne1896:0</button><br>
-		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;">
-
-		</div>
+		<div id="fonts" class="hide" style="overflow-y:scroll; width:300px; height:500px;"></div>
 		<br>
 		<input type="text" style="width:150px" id="font">
 		<button class="btn waves-effect" style="width:100px;" onclick="settings()">crwdns525:0crwdne525:0</button>
@ -184,6 +182,11 @@
 		<input class="with-gap" onchange="settings()" name="ticker" type="radio" id="ticker_no" value="no" />
 		<label for="ticker_no">crwdns527:0crwdne527:0</label>
 		<br>
+		<h5>{{animation}}</h5>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_yes" value="yes" />
+		<label for="anime_yes">crwdns526:0crwdne526:0</label>
+		<input class="with-gap" onchange="settings()" name="anime" type="radio" id="anime_no" value="no" />
+		<label for="anime_no">crwdns527:0crwdne527:0</label>
 	</div>
 	</li>
 	<li>
@ -427,7 +430,7 @@ Kyash<br>
 <a onclick="localStorage.removeItem('new-ver-skip'); location.href='index.html';" class="pointer">crwdns667:0crwdne667:0</a><br>
 <a href="oss.html">OSS Licensecrwdns668:0crwdne668:0</a><br>
 <span style="font-family:Open Sans;">Copyright &copy; TheDesk 2018 All Rights Reserved. 
-	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://github.com/cutls/TheDesk/blob/master/TOS.md">Terms of Use</a>
+	Under <a href="https://github.com/cutls/TheDesk/blob/master/LICENSE">GNU General Public License v3.0</a> and <a href="https://thedesk.top/tos.html">Terms of Use</a>/<a href="https://thedesk.top/priv.html">Privacy Policy</a>
 	<br>Developer: Cutls P( 
 	<a href="index.html?mode=user&code=Cutls@kirishima.cloud">@Cutls@kirishima.cloud</a>)
 	<br>