From 714feca4552509448dec477a53851a430e0d4081 Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Sat, 9 Nov 2019 14:38:43 +0900
Subject: [PATCH] TheDesk 20.0.1 (Kawaii)

---
 app/js/ui/tips.js               | 58 ---------------------------------
 app/package.json                |  2 +-
 app/view/make/index.sample.html |  9 +++--
 app/view/make/make.js           |  2 +-
 4 files changed, 9 insertions(+), 62 deletions(-)

diff --git a/app/js/ui/tips.js b/app/js/ui/tips.js
index c5999afb..ff2b6763 100644
--- a/app/js/ui/tips.js
+++ b/app/js/ui/tips.js
@@ -240,64 +240,6 @@ function spotStart() {
 	$('.spotify-prog').attr('data-s', news)
 	$('.spotify-prog').css('width', per + '%')
 }
-//iTunes
-function spotifytips() {
-	if (spotint) clearInterval(spotint)
-	var ms = json.progress_ms
-	var last = 1000 - (ms % 1000)
-	var item = json.item
-	var img = item.album.images[0].url
-	var artisttxt = ''
-	for (i = 0; i < item.artists.length; i++) {
-		if (i > 0) {
-			artisttxt = artisttxt + ',' + item.artists[i].name
-		} else {
-			artisttxt = item.artists[0].name
-		}
-	}
-	artisttxt = escapeHTML(artisttxt)
-	sleep(last)
-	var tms = item.duration_ms
-	var per = (ms / item.duration_ms) * 100
-	ms = ms / 1000
-	tms = tms / 1000
-	var s = Math.round(ms) % 60
-	if (s < 10) {
-		s = '0' + s
-	}
-	var m = (Math.round(ms) - (Math.round(ms) % 60)) / 60
-	var ts = Math.round(tms) % 60
-	if (ts < 10) {
-		ts = '0' + ts
-	}
-	var tm = (Math.round(tms) - (Math.round(tms) % 60)) / 60
-	var html = `
-		<div id="spot-box">
-			<div id="spot-refresh">
-				<i class="material-icons pointer" onclick="spotifytips()" style="font-size:20px">refresh</i>
-				<i class="material-icons pointer" onclick="nowplaying('spotify');show()" style="font-size:20px">send</i>
-			</div>
-			<div id="spot-cover">
-				<img src="${img}" id="spot-img">
-			</div>
-			<div id="spot-name">
-				${escapeHTML(item.name)}
-			</div>
-			<div id="spot-artist">
-				<span class="gray sml" id="spot-art">${artisttxt}</span>
-			</div>
-			<div id="spot-time">
-				<span id="spot-m">${m}</span>:<span id="spot-s">${s}</span>/${tm}:${ts}</span>
-			</div>
-			<div class="progress grey">
-			<div class="determinate spotify-prog grey lighten-2"
-			 style="width:${per}%" data-s="${Math.round(ms)}" data-total="${item.duration_ms}">
-			</div>
-		</div>
-		</div>`
-	$('#tips-text').html(html)
-	spotint = setInterval(spotStart, 1000)
-}
 function trendTagonTipInterval() {
 	setTimeout(trendTagonTip, 6000000)
 }
diff --git a/app/package.json b/app/package.json
index 8b3a86e6..ae29aeb9 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "20.0.0",
+  "version": "20.0.1",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
diff --git a/app/view/make/index.sample.html b/app/view/make/index.sample.html
index 277e13ca..34cd74de 100644
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@@ -760,10 +760,15 @@
 			<a href="https://thedesk.top" target="_blank">HP</a><br>
 			<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 			<br>
-			<div id="release-20-0-0_Kawaii" class="release-do" style="display:none; ">><br>
+			<div id="release-20-0-1_Kawaii" class="release-do" style="display:none; ">><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
+				<h5>Release Note 20.0.1 (Kawaii)</h5>
+				・緊急DoS対策(Spotify Tips)
+				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
+					<img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">Cutls
+				</a><br>
 				<h5>Release Note 20.0.0 (Kawaii)</h5>
 				・コードがKawaii感じ(Prettier)になりました
 				<a onclick="udgEx('Cutls@cutls.com','main')" class="contributor">
@@ -1133,7 +1138,7 @@
 					<a onclick="tips('trend')" class="nex waves-effect imasonly" style="display:none;">
 						<i class="material-icons nex" title="アイマストドントレンド" data-trans-title="trendtip">whatshot</i>
 					</a>
-					<a onclick="tips('spotify')" oncontextmenu="tips('itunes')" class="nex waves-effect">
+					<a onclick="tips('spotify')" class="nex waves-effect">
 						<i class="fab fa-spotify nex" title="Spotify" data-trans-title="spotifytips"></i>
 					</a>
 				</div>
diff --git a/app/view/make/make.js b/app/view/make/make.js
index b3c34989..bb897b84 100644
--- a/app/view/make/make.js
+++ b/app/view/make/make.js
@@ -1,4 +1,4 @@
-let ver = "20.0.0 (Kawaii)";
+let ver = "20.0.1 (Kawaii)";
 if (process.argv.indexOf("--automatic") === -1) {
     let input = require("readline-sync").question("version string [empty: " + ver + " (default)]? ");
     if (input) {