initial

.github/FUNDING.yml

@@ -5,4 +5,4 @@ patreon: cutls
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-custom: https://cutls.fanbox.cc
+custom: https://www.pixiv.net/fanbox/creator/28105985

app/css/master.css

@@ -11,6 +11,12 @@ body {
 html {
 	font-size: 13px;
 }
+.waves-effect:hover {
+	filter: brightness(80%);
+}
+.waves-effect:focus {
+	filter: brightness(70%);
+}
 .titlebar,
 .menubar-menu-container,
 .action-menu-item {

app/js/common/modal.js

@@ -1,6 +1,7 @@
 //モーダル・ドロップダウンの各種設定
 $(document).ready(function () {
   // the "href" attribute of the modal trigger must specify the modal ID that wants to be triggered
+  return;
   $('.modal').modal({
     inDuration: 300,
     outDuration: 225,

app/js/common/version.js

@@ -4,21 +4,18 @@ function verck(ver, jp) {
 	$('body').addClass(localStorage.getItem('platform'))
 	var date = new Date()
 	var showVer = false
-	//Spotify
-	if (localStorage.getItem('spotify')) {
-		localStorage.removeItem('spotify')
-		localStorage.removeItem('spotify-refresh')
-		var spDc = 'Spotify NowPlaying sysytem was changed, please re-login to Spotify'
-		if(lang.language == 'ja') {
-			spDc = 'Spotify NowPlayingの機能が変更されたため、もう一度ログインしてください'
-		}
-		Swal.fire({
-			type: 'info',
-			title: spDc,
-		})
-	}
-	//Spotify(e)
 	if (localStorage.getItem('ver') != ver && localStorage.getItem('winstore')) {
+		//ちょっと削除とリンク解析の都合上アレ(s)
+		//対象外のアプデ:storageが20の最初まで"Usamin (18.6.5)"
+		if (!localStorage.getItem('usamin_18_6_5_flag')) {
+			localStorage.setItem('usamin_18_6_5_flag', true)
+			var multi = localStorage.getItem('column')
+			var obj = JSON.parse(multi)
+			for (var i = 0; i < obj.length; i++) {
+				localStorage.removeItem('card_' + i)
+			}
+		}
+		//ちょっと削除とリンク解析の都合上アレ(e)
 		showVer = true
 		console.log('%c Thank you for your update🎉', 'color: red;font-size:200%;')
 		$(document).ready(function() {
@@ -207,7 +204,7 @@ function verck(ver, jp) {
 									}
 								}
 								if (showVer) {
-									M.toast({
+									Mtoast({
 										html:
 											escapeHTML(obj.text) +
 											toot +
@@ -268,7 +265,7 @@ function infowebsocket() {
 					if (showVer) {
 						console.log(obj.text)
 						console.log(escapeHTML(obj.text))
-						M.toast({
+						Mtoast({
 							html:
 								escapeHTML(obj.text) +
 								toot +

app/js/login/login.js

@@ -197,7 +197,7 @@ function getdata() {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -255,7 +255,7 @@ function getdataAdv(domain, at) {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -321,7 +321,7 @@ function refresh(target, loadskip) {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -573,7 +573,7 @@ function multiSelector(parseC) {
 		)
 		$('#dir-acct-sel').append('<option value="noauth">' + lang.lang_login_noauth + '</option>')
 	}
-	$('select').formSelect()
+	//$('select').formSelect()
 	if (!parseC) {
 		parseColumn(null, true)
 	}
@@ -590,7 +590,7 @@ function enc(ver) {
 }
 //インスタンスティッカー
 function ticker() {
-	var start = 'https://s.0px.io/json'
+	var start = 'https://toot.app/toot/index.php'
 	fetch(start, {
 		method: 'GET',
 		cors: true,
@@ -611,8 +611,7 @@ function ticker() {
 		})
 		.then(function(json) {
 			if (json) {
-				localStorage.removeItem('ticker')
-				localStorage.setItem('sticker', JSON.stringify(json))
+				localStorage.setItem('ticker', JSON.stringify(json))
 			}
 		})
 }

app/js/login/manager.js

@@ -640,7 +640,7 @@ function code(code) {
 		$('#code').val('')
 	}
 	if (!code || code == '') {
-		M.toast({ html: lang.lang_fatalerroroccured + 'Error: no code', displayLength: 5000 })
+		Mtoast({ html: lang.lang_fatalerroroccured + 'Error: no code', displayLength: 5000 })
 		return false
 	}
 	var url = localStorage.getItem('domain_tmp')
@@ -757,7 +757,7 @@ function getdata(domain, at) {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -830,7 +830,7 @@ function atSetup(type) {
 		}
 	}
 	if (!i || i == '') {
-		M.toast({ html: lang.lang_fatalerroroccured + 'Error: access token', displayLength: 5000 })
+		Mtoast({ html: lang.lang_fatalerroroccured + 'Error: access token', displayLength: 5000 })
 		return false
 	}
 	var obj = JSON.parse(multi)
@@ -883,7 +883,7 @@ function refresh(target) {
 		.then(function(json) {
 			if (json.error) {
 				console.error('Error:' + json.error)
-				M.toast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
+				Mtoast({ html: lang.lang_fatalerroroccured + 'Error:' + json.error, displayLength: 5000 })
 				return
 			}
 			var avatar = json['avatar']
@@ -1007,12 +1007,12 @@ function multisel() {
 			$('.acct-sel').append(template)
 		})
 	}
-	$('select').formSelect()
+	//$('select').formSelect()
 }
 function mainacct() {
 	var acct_id = $('#main-acct-sel').val()
 	localStorage.setItem('main', acct_id)
-	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
+	Mtoast({ html: lang.lang_manager_mainAcct, displayLength: 3000 })
 }
 function colorpicker(key) {
 	temp = `<div onclick="coloradd('${key}','def','def')" class="pointer exc">${lang.lang_manager_none}</div>

app/js/platform/end.js

@@ -153,7 +153,7 @@ onmessage = function(e) {
 		var showTxt = `${lang.lang_img_DLDone}${
 			e.data[1][0]
 		}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
-		M.toast({ html: showTxt, displayLength: 5000 })
+		Mtoast({ html: showTxt, displayLength: 5000 })
 	} else if (e.data[0] == 'parseColumn') {
 		parseColumn(e.data[1])
 	} else if (e.data[0] == 'exportSettingsCore') {

app/js/platform/first.js

@@ -225,6 +225,9 @@ function evalAttr(json, attr, lenCk) {
 		return false
 	}
 }
+function Mtoast(obj) {
+	return true
+}
 function statusModel(now) {
 	if (!now) {
 		var now = new Date().toString()

app/js/post/bb-md.js

@@ -45,7 +45,7 @@ function mdCheck() {
 		$('#trendtag').html('')
 	}
 	if (localStorage.getItem('mode_' + domain) == 'misskey') {
-		M.toast({ html: lang.lang_bbmd_misskey, displayLength: 5000 })
+		Mtoast({ html: lang.lang_bbmd_misskey, displayLength: 5000 })
 	}
 	if (idata[domain + '_letters']) {
 		$('#textarea').attr('data-length', idata[domain + '_letters'])

app/js/post/img.js

@@ -154,9 +154,9 @@ async function media(b64, type, no, stamped) {
 					$('#nsfw').addClass('nsfw-avail')
 				}
 				$('.toot-btn-group').prop('disabled', false)
-				$('select').formSelect()
+				//$('select').formSelect()
 				$('#mec').text(lang.lang_there)
-				M.toast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
+				Mtoast({ html: '<span>' + lang.lang_postimg_sync + '</span><button class="btn-flat toast-action" onclick="syncDetail()">Click</button>', displayLength: 3000 })
 				$('#imgup').text('')
 				$('#imgsel').show()
 				localStorage.removeItem('image')
@@ -176,9 +176,9 @@ async function media(b64, type, no, stamped) {
 			if (this.status !== 200) {
 				setLog(start, this.status, json)
 				$('.toot-btn-group').prop('disabled', false)
-				$('select').formSelect()
+				//$('select').formSelect()
 				$('#mec').text(lang.lang_there)
-				M.toast({ html: this.status + ':' +json, displayLength: 2000 })
+				Mtoast({ html: this.status + ':' +json, displayLength: 2000 })
 				$('#imgup').text('')
 				$('#imgsel').show()
 			}
@@ -187,14 +187,14 @@ async function media(b64, type, no, stamped) {
 				$('#imgup').text('')
 				$('.toot-btn-group').prop('disabled', false)
 				$('#post-acct-sel').prop('disabled', false)
-				$('select').formSelect()
+				//$('select').formSelect()
 				$('#imgsel').show()
-				M.toast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
+				Mtoast({ html: lang.lang_postimg_failupload, displayLength: 5000 })
 				return false
 			}
 			$('#imgup').text('')
 			$('.toot-btn-group').prop('disabled', false)
-			$('select').formSelect()
+			//$('select').formSelect()
 			$('#imgsel').show()
 			var img = localStorage.getItem('img')
 			if (json.type.indexOf('image') != -1) {

app/js/post/misskeystatus.js

@@ -34,7 +34,7 @@ function renoteqt(id, acct_id) {
 	$('#rec').text('Renote')
 	$('#post-acct-sel').val(acct_id)
 	$('#post-acct-sel').prop('disabled', true)
-	$('select').formSelect()
+	//$('select').formSelect()
 	$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
 	$('#textarea').focus()
 }
@@ -46,7 +46,7 @@ function misskeyreply(id, acct_id) {
 	$('#rec').text('Renote')
 	$('#post-acct-sel').val(acct_id)
 	$('#post-acct-sel').prop('disabled', true)
-	$('select').formSelect()
+	//$('select').formSelect()
 	$('#textarea').attr('placeholder', lang.lang_misskeyparse_qt)
 	$('#textarea').focus()
 }
@@ -120,7 +120,7 @@ function reactioncustom(acct_id, id) {
 	$('#unreact').hide()
 	$('#addreact').removeClass('hide')
 	$('#post-acct-sel').val(acct_id)
-	$('select').formSelect()
+	//$('select').formSelect()
 	localStorage.setItem('nohide', true)
 	show()
 	emojiToggle(true)

app/js/post/post.js

@@ -347,7 +347,7 @@ function clear() {
 		$('#post-acct-sel').val(localStorage.getItem('main'))
 	}
 	$('#emoji').addClass('hide')
-	$('select').formSelect()
+	//$('select').formSelect()
 	$('#default-emoji').show()
 	$('#unreact').show()
 	$('#addreact').addClass('hide')

app/js/post/status.js

@@ -49,7 +49,7 @@ function fav(id, acct_id, remote) {
 					$('.fav_' + id).addClass('yellow-text')
 				}
 			} else {
-				M.toast({ html: lang.lang_status_favWarn, displayLength: 1000 })
+				Mtoast({ html: lang.lang_status_favWarn, displayLength: 1000 })
 			}
 		}
 	}
@@ -240,7 +240,7 @@ async function acctResolve(acct_id, user) {
 	if (idJson.accounts[0]) {
 		var id = idJson.accounts[0].id
 	} else {
-		M.toast({ html: lang.lang_fatalerroroccured, displayLength: 2000 })
+		Mtoast({ html: lang.lang_fatalerroroccured, displayLength: 2000 })
 	}
 	return id
 }
@@ -428,7 +428,7 @@ function redraft(id, acct_id) {
 					var json = httpreq.response
 					$('#post-acct-sel').prop('disabled', true)
 					$('#post-acct-sel').val(acct_id)
-					$('select').formSelect()
+					//$('select').formSelect()
 					mdCheck()
 					var medias = $('[toot-id=' + id + ']').attr('data-medias')
 					var mediack = json.media_attachments[0]
@@ -580,7 +580,7 @@ function empUser() {
 	if (!obj) {
 		var obj = []
 		obj.push(id)
-		M.toast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
+		Mtoast({ html: id + lang.lang_status_emphas, displayLength: 4000 })
 	} else {
 		var can
 		Object.keys(obj).forEach(function(key) {
@@ -590,7 +590,7 @@ function empUser() {
 			} else {
 				can = true
 				obj.splice(key, 1)
-				M.toast({ html: id + lang.lang_status_unemphas, displayLength: 4000 })
+				Mtoast({ html: id + lang.lang_status_unemphas, displayLength: 4000 })
 			}
 		})
 	}
@@ -634,7 +634,7 @@ function pinUser() {
 //URLコピー
 function tootUriCopy(url) {
 	execCopy(url)
-	M.toast({ html: lang.lang_details_url, displayLength: 1500 })
+	Mtoast({ html: lang.lang_details_url, displayLength: 1500 })
 }
 
 //他のアカウントで…

app/js/post/use-txtbox.js

@@ -15,7 +15,7 @@ function re(id, ats_cm, acct_id, mode) {
 	$('#rec').text(lang.lang_yesno)
 	$('#post-acct-sel').val(acct_id)
 	$('#post-acct-sel').prop('disabled', true)
-	$('select').formSelect()
+	//$('select').formSelect()
 	mdCheck()
 	$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
 	$('#textarea').focus()
@@ -65,7 +65,7 @@ function qt(id, acct_id, at, url) {
 		$('#quote').val(id)
 		$('#post-acct-sel').val(acct_id)
 		$('#post-acct-sel').prop('disabled', true)
-		$('select').formSelect()
+		//$('select').formSelect()
 		$('#textarea').attr('placeholder', lang.lang_usetxtbox_reply)
 		$('#textarea').focus()
 		var profimg = localStorage.getItem('prof_' + acct_id)
@@ -75,7 +75,7 @@ function qt(id, acct_id, at, url) {
 		$('#acct-sel-prof').attr('src', profimg)
 	}
 	$('#post-acct-sel').val(acct_id)
-	$('select').formSelect()
+	//$('select').formSelect()
 	mdCheck()
 	$('#textarea').focus()
 }

app/js/tl/announParse.js

@@ -121,7 +121,7 @@ function announReactionNew(id, acct_id, tlid) {
 	$('#unreact').hide()
 	$('#addreact').removeClass('hide')
 	$('#post-acct-sel').val(acct_id)
-	$('select').formSelect()
+	//$('select').formSelect()
 	localStorage.setItem('nohide', true)
 	show()
 	emojiToggle(true)

app/js/tl/datails.js

@@ -555,10 +555,10 @@ function cbCopy(mode) {
 			`<iframe src="${url}/embed" class="mastodon-embed" style="max-width: 100%; border: 0" width="400"></iframe>
 			<script src="https://${domain}/embed.js" async="async"></script>`
 		execCopy(emb)
-		M.toast({ html: lang.lang_details_embed, displayLength: 1500 })
+		Mtoast({ html: lang.lang_details_embed, displayLength: 1500 })
 	} else {
 		if (execCopy(url)) {
-			M.toast({ html: lang.lang_details_url, displayLength: 1500 })
+			Mtoast({ html: lang.lang_details_url, displayLength: 1500 })
 		}
 	}
 }
@@ -573,7 +573,7 @@ function staCopy(id) {
 	html = html.replace(/<img[\s\S]*alt="(.+?)"[\s\S]*?>/g, '$1')
 	html = $.strip_tags(html)
 	if (execCopy(html)) {
-		M.toast({ html: lang.lang_details_txt, displayLength: 1500 })
+		Mtoast({ html: lang.lang_details_txt, displayLength: 1500 })
 	}
 }
 //翻訳

app/js/tl/misskeyparse.js

@@ -260,7 +260,7 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 				}
 				var domain = localStorage.getItem("domain_" + acct_id);
 				if (popup > 0) {
-					M.toast({ html: "[" + domain + "]" + escapeHTMLtemp(toot.user.name) + what, displayLength: popup * 1000 })
+					Mtoast({ html: "[" + domain + "]" + escapeHTMLtemp(toot.user.name) + what, displayLength: popup * 1000 })
 				}
 				if (native == "yes") {
 					var os = localStorage.getItem("platform");
@@ -888,7 +888,7 @@ function misskeyUserparse(obj, auth, acct_id, tlid, popup) {
 		}
 		var memory = localStorage.getItem("notice-mem");
 		if (popup >= 0 && obj.length < 5 && notftext != memory) {
-			M.toast({ html: escapeHTMLtemp(toot.name) + ":" + ftxt, displayLength: popup * 1000 })
+			Mtoast({ html: escapeHTMLtemp(toot.name) + ":" + ftxt, displayLength: popup * 1000 })
 			$(".notf-icon_" + tlid).addClass("red-text");
 			localStorage.setItem("notice-mem", notftext);
 			notftext = "";

app/js/tl/parse.js

@@ -194,7 +194,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 	}
 	var local = []
 	var times = []
-	Object.keys(obj).forEach(function (key) {
+	Object.keys(obj).forEach(function(key) {
 		var domain = localStorage.getItem('domain_' + acct_id)
 		var toot = obj[key]
 		if (type == 'dm') {
@@ -214,7 +214,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}
 		//絵文字があれば
 		if (actemojick) {
-			Object.keys(toot.account.emojis).forEach(function (key5) {
+			Object.keys(toot.account.emojis).forEach(function(key5) {
 				var emoji = toot.account.emojis[key5]
 				var shortcode = emoji.shortcode
 				if (gif == 'yes') {
@@ -273,7 +273,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				</i><span class="voice">${lang.lang_parse_notffilter}</span></span>
 				<span class="cbadge cbadge-hover" title="${date(toot.created_at, 'absolute')}(${
 				lang.lang_parse_notftime
-				})" aria-hidden="true"><i class="far fa-clock"></i>
+			})" aria-hidden="true"><i class="far fa-clock"></i>
 					${date(toot.created_at, datetype)}
 				</span>
 				<span class="voice">${date(toot.created_at, 'absolute')}(${lang.lang_parse_notftime})</span>
@@ -315,7 +315,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					}
 				}
 				if (popup > 0) {
-					M.toast({
+					Mtoast({
 						html: '[' + domain + ']' + escapeHTML(toot.account.display_name) + what,
 						displayLength: popup * 1000
 					})
@@ -369,7 +369,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//絵文字があれば
 			if (actemojick) {
-				Object.keys(toot.account.emojis).forEach(function (key5) {
+				Object.keys(toot.account.emojis).forEach(function(key5) {
 					var emoji = toot.account.emojis[key5]
 					var shortcode = emoji.shortcode
 					if (gif == 'yes') {
@@ -426,7 +426,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 				//絵文字があれば
 				if (actemojick) {
-					Object.keys(toot.account.emojis).forEach(function (key5) {
+					Object.keys(toot.account.emojis).forEach(function(key5) {
 						var emoji = toot.account.emojis[key5]
 						var shortcode = emoji.shortcode
 						if (gif == 'yes') {
@@ -454,7 +454,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					var fullname = toot.account.acct + '@' + domain
 				}
 				if (useremp) {
-					Object.keys(useremp).forEach(function (key10) {
+					Object.keys(useremp).forEach(function(key10) {
 						var user = useremp[key10]
 						if (user == fullname) {
 							boostback = 'emphasized'
@@ -494,7 +494,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				var via = escapeHTML(toot.application.name)
 				if (empCli) {
 					//強調チェック
-					Object.keys(empCli).forEach(function (key6) {
+					Object.keys(empCli).forEach(function(key6) {
 						var empCliList = empCli[key6]
 						if (empCliList == via) {
 							boostback = 'emphasized'
@@ -503,7 +503,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				}
 				if (muteCli) {
 					//ミュートチェック
-					Object.keys(muteCli).forEach(function (key7) {
+					Object.keys(muteCli).forEach(function(key7) {
 						var muteCliList = muteCli[key7]
 						if (muteCliList == via) {
 							boostback = 'hide'
@@ -597,7 +597,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			if (mediack) {
 				hasmedia = 'hasmedia'
 				var cwdt = 100 / toot.media_attachments.length
-				Object.keys(toot.media_attachments).forEach(function (key2) {
+				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 + ','
@@ -669,7 +669,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			if (menck) {
 				mentions = ''
 				var to_mention = []
-				Object.keys(toot.mentions).forEach(function (key3) {
+				Object.keys(toot.mentions).forEach(function(key3) {
 					var mention = toot.mentions[key3]
 					//自分は除外
 					//自インスタンスかどうかを確認し、IDの一致
@@ -704,19 +704,19 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			var tags = ''
 			//タグであれば
 			if (tagck) {
-				Object.keys(toot.tags).forEach(function (key4) {
+				Object.keys(toot.tags).forEach(function(key4) {
 					var tag = toot.tags[key4]
 					var featured = `　<a onclick="tagFeature('${tag.name}','${acct_id}')" class="pointer" title="add it to Featured tags">Feature</a>　`
 					tags =
 						tags +
 						`<span class="hide" data-tag="${tag.name}" data-regTag="${tag.name.toLowerCase()}">#${
-						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}')" 
+									'{{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}}',
@@ -812,7 +812,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//ワードミュート
 			if (wordmuteList) {
-				Object.keys(wordmuteList).forEach(function (key8) {
+				Object.keys(wordmuteList).forEach(function(key8) {
 					var worde = wordmuteList[key8]
 					if (worde) {
 						if (worde.tag) {
@@ -829,7 +829,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//ワード強調
 			if (wordempList) {
-				Object.keys(wordempList).forEach(function (key9) {
+				Object.keys(wordempList).forEach(function(key9) {
 					var wordList = wordempList[key9]
 					if (wordList) {
 						var wordList = wordList.tag
@@ -845,7 +845,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//絵文字があれば
 			if (emojick) {
-				Object.keys(toot.emojis).forEach(function (key5) {
+				Object.keys(toot.emojis).forEach(function(key5) {
 					var emoji = toot.emojis[key5]
 					var shortcode = emoji.shortcode
 					if (gif == 'yes') {
@@ -871,7 +871,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			//絵文字があれば(nico)
 			if (nicoemojick) {
-				Object.keys(toot.profile_emojis).forEach(function (keynico) {
+				Object.keys(toot.profile_emojis).forEach(function(keynico) {
 					var emoji = toot.profile_emojis[keynico]
 					var shortcode = emoji.shortcode
 					var emoji_url = `<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" alt=" :${shortcode}: "
@@ -918,10 +918,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//Ticker
 			var tickerdom = ''
 			if (ticker) {
-				var tickerdata = localStorage.getItem('sticker')
+				var tickerdata = localStorage.getItem('ticker')
 				if (tickerdata) {
-					var tickerdataRaw = JSON.parse(tickerdata)
-					var tickerdata = tickerdataRaw.data
+					var tickerdata = JSON.parse(tickerdata)
 
 					var thisdomain = toot.account.acct.split('@')
 					if (thisdomain.length > 1) {
@@ -930,41 +929,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					for (var i = 0; i < tickerdata.length; i++) {
 						var value = tickerdata[i]
 						if (value.domain == thisdomain) {
-							var bgColor = value.bgColor
-							var fontColor = value.fontColor
-							if (!value.bgColor || !value.fontColor) {
-								if (value.type == 'mastodon') {
-									if(!value.bgColor) bgColor = tickerdataRaw.default.mastodon.bgColor
-									if(!value.fontColor) fontColor = tickerdataRaw.default.mastodon.fontColor
-								} else if (value.type == 'pleroma') {
-									if(!value.bgColor) bgColor = tickerdataRaw.default.pleroma.bgColor
-									if(!value.fontColor) fontColor = tickerdataRaw.default.pleroma.fontColor
-								} else if (value.type == 'misskey') {
-									if(!value.bgColor) bgColor = tickerdataRaw.default.misskey.bgColor
-									if(!value.fontColor) fontColor = tickerdataRaw.default.misskey.fontColor
-								} else if (value.type == 'misskeylegacy') {
-									if(!value.bgColor) bgColor = tickerdataRaw.default.misskeylegacy.bgColor
-									if(!value.fontColor) fontColor = tickerdataRaw.default.misskeylegacy.fontColor
-								} else if (value.type == 'pixelfed') {
-									if(!value.bgColor) bgColor = tickerdataRaw.default.pixelfed.bgColor
-									if(!value.fontColor) fontColor = tickerdataRaw.default.pixelfed.fontColor
-								}
-							} else {
-								var bgColor = value.bgColor
-								var fontColor = value.fontColor
-							}
-							bgColorCSS = ''
-							for (let j = 0; j < bgColor.length; j++) {
-								const bg = bgColor[j]
-								bgColorCSS = bgColorCSS + bg + ','
-							}
-							bgColorCSS = `linear-gradient(90deg, ${bgColorCSS} transparent)`
-							var tickerdom = `<div aria-hidden="true" style="user-select:none;cursor:default;background:${bgColorCSS} !important; color:${
-								fontColor
-								};width:100%; height:0.9rem; font-size:0.8rem;" class="tickers">
+							var tickerdom = `<div aria-hidden="true" style="user-select:none;cursor:default;background:linear-gradient(90deg, ${
+								value.bg
+							}, transparent 96%) !important; color:${
+								value.text
+							};width:100%; height:0.9rem; font-size:0.8rem;" class="tickers">
 									<img draggable="false" src="${
-								value.favicon
-								}" style="height:100%;" onerror="this.src=\'../../img/loading.svg\'">
+										value.image
+									}" style="height:100%;" onerror="this.src=\'../../img/loading.svg\'">
 									<span style="position:relative; top:-0.2rem;">${escapeHTML(value.name)}</span>
 								</div>`
 							break
@@ -978,14 +950,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				if (!quoteUser) {
 					quoteUser = toot.quote.account.acct
 				}
-				if (!toot.quote.quote_muted) {
+				if(!toot.quote.quote_muted) {
 					poll =
-						poll +
-						`<div class="quote-renote">
+					poll +
+					`<div class="quote-renote">
 						<div class="renote-icon">
 							<a onclick="udg('${toot.quote.account.id}','${acct_id}');" user="${
 						toot.quote.account.acct
-						}" class="udg">
+					}" class="udg">
 								<img draggable="false" src="${toot.quote.account.avatar}">
 							</a>
 						</div>
@@ -997,18 +969,18 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</div>
 						<div class="renote-details">
 							<a onclick="details('${
-						toot.quote.id
-						}','${acct_id}','${tlid}','normal')" class="waves-effect waves-dark btn-flat details" style="padding:0">
+								toot.quote.id
+							}','${acct_id}','${tlid}','normal')" class="waves-effect waves-dark btn-flat details" style="padding:0">
 								<i class="text-darken-3 material-icons">more_vert</i>
 							</a>
 						</div>
 					</div>`
 				} else {
 					poll =
-						poll +
-						`<span class="gray sml">${lang.lang_parse_hidden}</span>`
+					poll +
+					`<span class="gray sml">${lang.lang_parse_hidden}</span>`
 				}
-
+				
 			}
 			//menuは何個？
 			var menuct = 2
@@ -1097,8 +1069,8 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					</div>
 					<div class="action ${can_rt} ${disp['rt']} ${noauth}">
 						<a onclick="rt('${
-				toot.id
-				}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
+							toot.id
+						}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
 							style="padding:0" title="${lang.lang_parse_bt}">
 							<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
 							<span class="voice">${lang.lang_parse_bt} </span>
@@ -1209,7 +1181,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	}
 	var templete = ''
 	var datetype = localStorage.getItem('datetype')
-	Object.keys(obj).forEach(function (key) {
+	Object.keys(obj).forEach(function(key) {
 		var toot = obj[key]
 		if (toot) {
 			if (!toot.username) {
@@ -1254,7 +1226,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				var memory = localStorage.getItem('notice-mem')
 				if (popup >= 0 && obj.length < 5 && notftext != memory) {
-					M.toast({ html: escapeHTML(toot.display_name) + ':' + ftxt, displayLength: popup * 1000 })
+					Mtoast({ html: escapeHTML(toot.display_name) + ':' + ftxt, displayLength: popup * 1000 })
 					$('.notf-icon_' + tlid).addClass('red-text')
 					localStorage.setItem('notice-mem', notftext)
 					notftext = ''
@@ -1286,7 +1258,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				//絵文字があれば
 				if (actemojick) {
-					Object.keys(toot.emojis).forEach(function (key5) {
+					Object.keys(toot.emojis).forEach(function(key5) {
 						var emoji = toot.emojis[key5]
 						var shortcode = emoji.shortcode
 						if (gif == 'yes') {
@@ -1394,22 +1366,22 @@ function client(name) {
 				if (!obj) {
 					var obj = []
 					obj.push(name)
-					M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
+					Mtoast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
 				} else {
 					var can
-					Object.keys(obj).forEach(function (key) {
+					Object.keys(obj).forEach(function(key) {
 						var cliT = obj[key]
 						if (cliT != name && !can) {
 							can = false
 						} else {
 							can = true
 							obj.splice(key, 1)
-							M.toast({ html: escapeHTML(name) + lang.lang_status_unemphas, displayLength: 2000 })
+							Mtoast({ html: escapeHTML(name) + lang.lang_status_unemphas, displayLength: 2000 })
 						}
 					})
 					if (!can) {
 						obj.push(name)
-						M.toast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
+						Mtoast({ html: escapeHTML(name) + lang.lang_status_emphas, displayLength: 2000 })
 					} else {
 					}
 					var json = JSON.stringify(obj)
@@ -1426,7 +1398,7 @@ function client(name) {
 				obj.push(name)
 				var json = JSON.stringify(obj)
 				localStorage.setItem('client_mute', json)
-				M.toast({ html: escapeHTML(name) + lang.lang_parse_mute, displayLength: 2000 })
+				Mtoast({ html: escapeHTML(name) + lang.lang_parse_mute, displayLength: 2000 })
 				parseColumn()
 			}
 		})
@@ -1485,7 +1457,7 @@ function pollParse(poll, acct_id, emojis) {
 		var max = 0
 	}
 
-	Object.keys(choices).forEach(function (keyc) {
+	Object.keys(choices).forEach(function(keyc) {
 		var choice = choices[keyc]
 		var voteit = ''
 		for (var i = 0; i < minechoice.length; i++) {
@@ -1520,7 +1492,7 @@ function pollParse(poll, acct_id, emojis) {
 		var choiceText = escapeHTML(choice.title)
 		if (emojis) {
 			//絵文字があれば
-			Object.keys(emojis).forEach(function (key5) {
+			Object.keys(emojis).forEach(function(key5) {
 				var emoji = emojis[key5]
 				var shortcode = emoji.shortcode
 				if (gif == 'yes') {

app/js/tl/speech.js

@@ -143,14 +143,14 @@ function voiceSettings() {
 	var awk = $('[name=bym]:checked').val()
 	if (awk == 'yes') {
 		localStorage.setItem('voice_bouyomi', 'yes')
-		M.toast({ html: 'Bouyomi Chan connection requires WebSocket Plugin', displayLength: 3000 })
+		Mtoast({ html: 'Bouyomi Chan connection requires WebSocket Plugin', displayLength: 3000 })
 	} else {
 		localStorage.removeItem('voice_bouyomi')
 	}
 	localStorage.setItem('voice_speed', $('#voicespeed').val() / 10)
 	localStorage.setItem('voice_pitch', $('#voicepitch').val() / 50)
 	localStorage.setItem('voice_vol', $('#voicevol').val() / 100)
-	M.toast({ html: lang.lang_speech_refresh, displayLength: 3000 })
+	Mtoast({ html: lang.lang_speech_refresh, displayLength: 3000 })
 }
 function voiceSettingLoad() {
 	var flag = localStorage.getItem('voice_bouyomi')

app/js/tl/tag.js

@@ -156,10 +156,10 @@ function autoToot(tag) {
 	var nowPT = localStorage.getItem('stable')
 	if (nowPT == tag) {
 		localStorage.removeItem('stable')
-		M.toast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
+		Mtoast({ html: lang.lang_tags_unrealtime, displayLength: 3000 })
 	} else {
 		localStorage.setItem('stable', tag)
-		M.toast({
+		Mtoast({
 			html: lang.lang_tags_tagwarn.replace('{{tag}}', tag).replace('{{tag}}', tag),
 			displayLength: 3000
 		})
@@ -195,7 +195,7 @@ function tagFeature(name, acct_id) {
 		})
 		.then(function(json) {
 			console.log(json)
-			M.toast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
+			Mtoast({ html: 'Complete: ' + escapeHTML(name), displayLength: 3000 })
 		})
 }
 //タグのフィルタ

app/js/tl/tl.js

@@ -1000,7 +1000,7 @@ function reconnector(tlid, type, acct_id, data, mode) {
 		var mute = getFilterTypeByAcct(acct_id, type)
 		reload(type, '', acct_id, tlid, data, mute, '', voice, mode)
 	}
-	M.toast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
+	Mtoast({ html: lang.lang_tl_reconnect, displayLength: 2000 })
 }
 function columnReload(tlid, type) {
 	$('#notice_icon_' + tlid).addClass('red-text')

app/js/ui/img.js

@@ -291,5 +291,5 @@ function stopVideo() {
 function copyImgUrl() {
 	var murl = $('#imagemodal').attr('data-original')
 	execCopy(murl)
-	M.toast({ html: lang.lang_img_copyDone, displayLength: 1500 })
+	Mtoast({ html: lang.lang_img_copyDone, displayLength: 1500 })
 }

app/js/ui/settings.js

@@ -5,7 +5,7 @@ var envView = new Vue({
 	methods: {
 		complete: function (i, val) {
 			var ls = envView.config[i].storage
-			M.toast({ html: 'Complete', displayLength: 3000 })
+			Mtoast({ html: 'Complete', displayLength: 3000 })
 			if (!val) {
 				var id = envView.config[i].id
 				var val = $('#' + id).val()
@@ -39,7 +39,7 @@ var tlView = new Vue({
 					ls = ls.data
 				}
 				for (var j = 0; j < ls.length; j++) {
-					M.toast({ html: 'Complete', displayLength: 3000 })
+					Mtoast({ html: 'Complete', displayLength: 3000 })
 					var id = ls[j].id
 					var val = $('#' + id).val()
 					localStorage.setItem(ls[j].storage, val)
@@ -68,7 +68,7 @@ var postView = new Vue({
 					ls = ls.data
 				}
 				for (var j = 0; j < ls.length; j++) {
-					M.toast({ html: 'Complete', displayLength: 3000 })
+					Mtoast({ html: 'Complete', displayLength: 3000 })
 					var id = ls[j].id
 					var val = $('#' + id).val()
 					localStorage.setItem(ls[j].storage, val)
@@ -90,7 +90,7 @@ function settings() {
 		$('#' + theme).prop('checked', true)
 	} else {
 		if (cd != localStorage.getItem('theme')) {
-			M.toast({ html: lang.lang_setting_theme.replace('{{set}}', ct), displayLength: 3000 })
+			Mtoast({ html: lang.lang_setting_theme.replace('{{set}}', ct), displayLength: 3000 })
 		}
 		//テーマはこの場で設定
 		themes(cd)
@@ -99,14 +99,14 @@ function settings() {
 	var fontd = $('#font').val()
 	if (fontd) {
 		if (fontd != localStorage.getItem('font')) {
-			M.toast({ html: lang.lang_setting_font.replace('{{set}}', fontd), displayLength: 3000 })
+			Mtoast({ html: lang.lang_setting_font.replace('{{set}}', fontd), displayLength: 3000 })
 		}
 		localStorage.setItem('font', fontd)
 		themes()
 	} else {
 		if (localStorage.getItem('font')) {
 			localStorage.removeItem('font')
-			M.toast({ html: lang.lang_setting_font.replace('{{set}}', '"default"'), displayLength: 3000 })
+			Mtoast({ html: lang.lang_setting_font.replace('{{set}}', '"default"'), displayLength: 3000 })
 			themes()
 		}
 	}
@@ -286,7 +286,7 @@ function notftest() {
 function oks(no) {
 	var txt = $('#oks-' + no).val()
 	localStorage.setItem('oks-' + no, txt)
-	M.toast({ html: lang.lang_setting_ksref, displayLength: 3000 })
+	Mtoast({ html: lang.lang_setting_ksref, displayLength: 3000 })
 }
 function oksload() {
 	if (localStorage.getItem('oks-1')) {
@@ -656,7 +656,7 @@ function ctLoadCore(args) {
 	$('#custom-sel-sel').html(templete)
 	templete = '<option value="add_new">' + $('#edit-selector').attr('data-add') + '</option>' + templete
 	$('#custom-edit-sel').html(templete)
-	$('select').formSelect()
+	//$('select').formSelect()
 }
 function customSel() {
 	var id = $('#custom-sel-sel').val()
@@ -830,5 +830,5 @@ function lastFmSet() {
 	} else {
 		localStorage.removeItem('lastFmUser')
 	}
-	M.toast({ html: 'Complete: last.fm', displayLength: 3000 })
+	Mtoast({ html: 'Complete: last.fm', displayLength: 3000 })
 }

app/js/ui/sort.js

@@ -104,7 +104,7 @@ function sort() {
 	var json = JSON.stringify(newobj);
 	localStorage.setItem("column", json);
 	$("#sort").html("");
-	M.toast({ html: "Sorted", displayLength: 3000 })
+	Mtoast({ html: "Sorted", displayLength: 3000 })
 	sortLoad();
 	parseColumn();
 	sortMenu()

app/js/ui/spotify.js

@@ -1,44 +1,30 @@
 function spotifyConnect() {
-	var auth = 'https://spotify.thedesk.top/connect'
-	$('#spotify-code-show').removeClass('hide')
-	postMessage(['openUrl', auth], '*')
+	var auth = 'https://accounts.spotify.com/authorize?client_id=0f18e54abe0b4aedb4591e353d3aff69&redirect_uri=https://thedesk.top/spotify-connect&response_type=code&scope=user-read-currently-playing'
+	var platform = localStorage.getItem('platform')
+	if (platform == 'win32') {
+		postMessage(['openUrl', auth], '*')
+		postMessage(['sendSinmpleIpc', 'quit'], '*')
+	} else {
+		auth = auth + '&state=code'
+		$('#spotify-code-show').removeClass('hide')
+		postMessage(['openUrl', auth], '*')
+	}
 }
 function spotifyAuth() {
 	var code = $('#spotify-code').val()
-	localStorage.setItem('spotify-token', code)
+	localStorage.setItem('spotify', 'code')
+	localStorage.setItem('spotify-refresh', code)
 	$('#spotify-code-show').addClass('hide')
 	$('#spotify-enable').addClass('disabled')
 	$('#spotify-disable').removeClass('disabled')
 }
 function spotifyDisconnect() {
-	var start = 'https://spotify.thedesk.top/disconnect?code=' + localStorage.getItem('spotify-token')
-	fetch(start, {
-		method: 'GET',
-		headers: {
-			'content-type': 'application/json',
-		},
-	})
-		.then(function (response) {
-			if (!response.ok) {
-				response.text().then(function (text) {
-					setLog(response.url, response.status, text)
-				})
-			}
-			return response.json()
-		})
-		.catch(function (error) {
-			todo(error)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function (json) {
-			if(!json.success) alert('error')
-			localStorage.removeItem('spotify-token')
-			checkSpotify()
-		})
+	localStorage.removeItem('spotify')
+	localStorage.removeItem('spotify-refresh')
+	checkSpotify()
 }
 function checkSpotify() {
-	if (localStorage.getItem('spotify-token')) {
+	if (localStorage.getItem('spotify')) {
 		$('#spotify-enable').addClass('disabled')
 		$('#spotify-disable').removeClass('disabled')
 	} else {
@@ -67,26 +53,26 @@ function spotifyFlagSave() {
 	var awk = $('[name=awk]:checked').val()
 	if (awk == 'yes') {
 		localStorage.setItem('artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
+		Mtoast({ html: lang.lang_spotify_img, displayLength: 3000 })
 	} else {
 		localStorage.removeItem('artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
+		Mtoast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
 	}
 }
 function aMusicFlagSave() {
 	var awk = $('[name=amw]:checked').val()
 	if (awk == 'yes') {
 		localStorage.setItem('complete-artwork', 'yes')
-		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 })
+		Mtoast({ html: lang.lang_spotify_img, displayLength: 3000 })
 	} else {
 		localStorage.removeItem('complete-artwork')
-		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
+		Mtoast({ html: lang.lang_spotify_imgno, displayLength: 3000 })
 	}
 }
 function nowplaying(mode) {
 	if (mode == 'spotify') {
-		var start = 'https://spotify.thedesk.top/current-playing?code=' + localStorage.getItem('spotify-token')
-		var at = localStorage.getItem('spotify-token')
+		var start = 'https://thedesk.top/now-playing?at=' + localStorage.getItem('spotify') + '&rt=' + localStorage.getItem('spotify-refresh')
+		var at = localStorage.getItem('spotify')
 		if (at) {
 			fetch(start, {
 				method: 'GET',
@@ -107,10 +93,7 @@ function nowplaying(mode) {
 					setLog(start, 'JSON', error)
 					console.error(error)
 				})
-				.then(function (jsonRaw) {
-					var code = jsonRaw.token
-					localStorage.setItem('spotify-token', code)
-					var json = jsonRaw.data
+				.then(function (json) {
 					console.table(json)
 					if (json.length < 1) {
 						return false
@@ -186,9 +169,9 @@ function nowplaying(mode) {
 						return false
 					}
 					var item = json.recenttracks.track[0]
-					if (!item['@attr']) return false
+					if(!item['@attr']) return false
 					var img = item.image[3]['#text']
-					var isImg = item.streamable * 1
+					var isImg = item.streamable*1
 					var flag = localStorage.getItem('artwork')
 					if (flag && isImg && img) {
 						postMessage(['bmpImage', [img, 0]], '*')
@@ -204,7 +187,7 @@ function nowplaying(mode) {
 					var regExp = new RegExp('{artist}', 'g')
 					content = content.replace(regExp, item.artist['#text'])
 					var regExp = new RegExp('{url}', 'g')
-					content = content.replace(regExp, '')
+					content = content.replace(regExp,'')
 					var regExp = new RegExp('{composer}', 'g')
 					content = content.replace(regExp, '')
 					var regExp = new RegExp('{hz}', 'g')
@@ -284,7 +267,7 @@ async function npCore(arg) {
 function spotifySave() {
 	var temp = $('#np-temp').val()
 	localStorage.setItem('np-temp', temp)
-	M.toast({ html: lang.lang_spotify_np, displayLength: 3000 })
+	Mtoast({ html: lang.lang_spotify_np, displayLength: 3000 })
 }
 if (location.search) {
 	var m = location.search.match(/\?mode=([a-zA-Z-0-9]+)\&code=(.+)/)

app/js/ui/tips.js

@@ -131,8 +131,12 @@ function trendTagonTip() {
 spotint = null
 function spotifytips() {
 	if (spotint) clearInterval(spotint)
-	var start = 'https://spotify.thedesk.top/current-playing?code=' + localStorage.getItem('spotify-token')
-	var at = localStorage.getItem('spotify-token')
+	var start =
+		'https://thedesk.top/now-playing?at=' +
+		localStorage.getItem('spotify') +
+		'&rt=' +
+		localStorage.getItem('spotify-refresh')
+	var at = localStorage.getItem('spotify')
 	if (at) {
 		fetch(start, {
 			method: 'GET',
@@ -153,10 +157,7 @@ function spotifytips() {
 				setLog(start, 'JSON', error)
 				console.error(error)
 			})
-			.then(function(jsonRaw) {
-				var code = jsonRaw.token
-				localStorage.setItem('spotify-token', code)
-				var json = jsonRaw.data
+			.then(function(json) {
 				var ms = json.progress_ms
 				if(!ms) {
 					tips('ver')

app/js/userdata/showOnTL.js

@@ -99,7 +99,7 @@ function udg(user, acct_id) {
 			}
 			//moved設定時
 			if (json.moved) {
-				M.toast({
+				Mtoast({
 					html: lang.lang_showontl_movetxt + '<button class="btn-flat toast-action" onclick="udg(\'' + json.moved.id + "','" + acct_id + "')\">" + lang.lang_showontl_movebtn + "</button>",
 					displayLength: 4000
 				});
@@ -483,7 +483,7 @@ function setMain() {
 	var acct_id = $("#his-data").attr("use-acct");
 	localStorage.setItem("main", acct_id);
 	multiSelector(true);
-	M.toast({ html: lang.lang_manager_mainAcct, displayLength: 3000 });
+	Mtoast({ html: lang.lang_manager_mainAcct, displayLength: 3000 });
 }
 //オールリセット
 function hisclose() {

app/maxim.ja.json

@@ -50,5 +50,5 @@
     "N押すとトゥートのボックスが出て、すぐ打ち込める。",
     "Xを押すとトゥートのボックスは出るけど、打ち込めない。その代わりもう一度押すと消せる。",
     "トゥートした後ボックスを閉じるとかそのままにしておくとかは、設定で変えられます。",
-    "OpenStickerへの登録データ募集中"
-    ]
+    "ヌァ＝スコ゜、ケエンョ゛ハー゛オセム゛ヌトョ！。シレモゥチャスモハァーワ」。チスョ「ラネ゛ワフン（ァクミス"
+]

app/package.json

@@ -1,6 +1,6 @@
 {
     "name": "thedesk",
-    "version": "21.0.5",
+    "version": "21.0.4",
     "codename": "Mayu",
     "description": "TheDesk is a Mastodon client for PC.",
     "repository": "https://github.com/cutls/TheDesk",
@@ -51,17 +51,17 @@
     ],
     "license": "GPL-3.0",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.14.0",
-        "custom-electron-titlebar": "^3.2.3",
+        "@fortawesome/fontawesome-free": "^5.13.1",
+        "custom-electron-titlebar": "^3.2.2-hotfix62",
         "electron-dl": "^3.0.1",
         "jimp": "^0.14.0",
         "jquery": "^3.5.1",
         "jquery-ui-dist": "^1.12.1",
         "json5": "^2.1.3",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.15",
         "materialize-css": "git://github.com/cutls/materialize#v1-dev",
         "sumchecker": "^3.0.1",
-        "sweetalert2": "^9.17.0",
+        "sweetalert2": "^9.15.2",
         "system-font-families": "^0.4.1",
         "vue": "^2.6.11"
     },
@@ -69,8 +69,8 @@
         "itunes-nowplaying-mac": "0.3.1"
     },
     "devDependencies": {
-        "chokidar": "^3.4.1",
-        "electron": "^9.1.1",
+        "chokidar": "^3.4.0",
+        "electron": "^9.0.5",
         "electron-builder": "^22.7.0",
         "electron-rebuild": "^1.11.0",
         "readline-sync": "1.4.10"

app/view/make/index.sample.html

@@ -1127,7 +1127,7 @@
 				<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-21-0-5_Mayu" class="release-do" style="display:none; ">
+				<div id="release-21-0-4_Mayu" class="release-do" style="display:none; ">
 					<br />
 					<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br />
 					Pixiv
@@ -1135,8 +1135,8 @@
 					困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
 					<h5>Release Note 21.0.4 (Mayu)</h5>
 					<!--上のdivのidも変えてね-->
-					・Spotify連携を再設計(全員再ログインをお願いします)  <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>
-・InstanceTickerを廃止し、OpenStickerを導入  <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>
+					・起動しないバグ  <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>
+・引用可能なインスタンスで、すべてのトゥートがミュートされた引用になってしまうバグ heguro<br>
 
 				</div>
 				<div id="release-en" style="display:none">
@@ -1724,10 +1724,10 @@
 		<script type="text/javascript" src="../../@@node_base@@/jquery/dist/jquery.js"></script>
 		<script type="text/javascript" src="../../js/platform/first.js"></script>
 		<script type="text/javascript" src="../../@@node_base@@/grapheme-splitter/index.js"></script>
-		<script
+		<!--script
 			type="text/javascript"
 			src="../../@@node_base@@/materialize-css/dist/js/materialize.js"
-		></script>
+		></script-->
 		<script type="text/javascript" src="../../@@node_base@@/lodash/lodash.min.js"></script>
 		<script type="text/javascript" src="main.js"></script>
 		<script type="text/javascript" src="../../js/common/time.js"></script>

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

@@ -101,8 +101,8 @@
   "or": "or",
   "imgheight": "Height of images",
   "imgheightwarn": "Option:Set \"full\" to uncrop.",
-  "ticker": "Enable OpenSticker",
-  "tickerwarn": "Show the instance name and favicon of tooters <a href=\"https://opensticker.0px.io\">About OpenSticker</a>",
+  "ticker": "Enable #InstanceTicker",
+  "tickerwarn": "Show colorful stickers about the server. <a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">About #InstanceTicker</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "Animation of timelines",
   "markers": "Markers(mark as read) on HTL and notifications",
   "markerswarn": "Mastodon 3.0~. Shared on WebUI and third-party supported clients.",

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

@@ -100,8 +100,8 @@
   "or": "または",
   "imgheight": "画像の高さ",
   "imgheightwarn": "オプション:「full」と指定すると全ての画像をクロップせず全部出すで。",
-  "ticker": "OpenStickerを使う",
-  "tickerwarn": "そのトゥートの発信者のサーバー名やFaviconを表示します。<a href=\"https://opensticker.0px.io\">OpenStickerについて</a>",
+  "ticker": "#InstanceTickerを使う",
+  "tickerwarn": "トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">#InstanceTickerってなんや？</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "タイムラインのアニメーション",
   "markers": "ホームと通知の未読管理",
   "markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有するやつや。",

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

@@ -101,8 +101,8 @@
   "or": "または",
   "imgheight": "画像の高さ",
   "imgheightwarn": "オプション:「full」と指定すると全ての画像をクロップしません。",
-  "ticker": "OpenStickerを使う",
-  "tickerwarn": "そのトゥートの発信者のサーバー名やFaviconを表示します。<a href=\"https://opensticker.0px.io\">OpenStickerについて</a>",
+  "ticker": "#InstanceTickerを使う",
+  "tickerwarn": "トゥートした人の所属サーバーをわかりやすく彩ります(自サーバー以外のトゥート向け)。<a href=\"https://github.com/MiyonMiyon/InstanceTicker_List\">#InstanceTickerについて</a> (c)2018-2020 MiyonMiyon. Released under the MIT License.",
   "animation": "タイムラインのアニメーション",
   "markers": "ホームと通知の未読管理",
   "markerswarn": "Mastodon 3.0相当以上。WebUIと対応クライアントで共有されます。",

app/yarn.lock

@@ -37,10 +37,10 @@
     global-agent "^2.0.2"
     global-tunnel-ng "^2.7.1"
 
-"@fortawesome/fontawesome-free@^5.14.0":
-  version "5.14.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.14.0.tgz#a371e91029ebf265015e64f81bfbf7d228c9681f"
-  integrity sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA==
+"@fortawesome/fontawesome-free@^5.13.1":
+  version "5.13.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.1.tgz#c53b4066edae16cd1fd669f687baf031b45fb9d6"
+  integrity sha512-D819f34FLHeBN/4xvw0HR0u7U2G7RqjPSggXqf7LktsxWQ48VAfGwvMrhcVuaZV2fF069c/619RdgCCms0DHhw==
 
 "@jimp/bmp@^0.14.0":
   version "0.14.0"
@@ -747,10 +747,10 @@ chalk@^4.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chokidar@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.1.tgz#e905bdecf10eaa0a0b1db0c664481cc4cbc22ba1"
-  integrity sha512-TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g==
+chokidar@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.0.tgz#b30611423ce376357c765b9b8f904b9fba3c0be8"
+  integrity sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==
   dependencies:
     anymatch "~3.1.1"
     braces "~3.0.2"
@@ -925,10 +925,10 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-custom-electron-titlebar@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/custom-electron-titlebar/-/custom-electron-titlebar-3.2.3.tgz#41da10b97958639e96a04275051bb5f78a666fc3"
-  integrity sha512-7DIZELlDoiAKT+i73XF9EG778M3/SYMmGa867cn3d0mLEEXDtEJq9sqM/u57vrtjolXKJ5ZJQ9hCCL2uxx9nxQ==
+custom-electron-titlebar@^3.2.2-hotfix62:
+  version "3.2.2-hotfix62"
+  resolved "https://registry.yarnpkg.com/custom-electron-titlebar/-/custom-electron-titlebar-3.2.2-hotfix62.tgz#94b908f0f2bf812e4f65447a26b93b88f7a76088"
+  integrity sha512-Kh86xAolkCpqj4AD/H4HcR2pEtxUyIHzMzqwkxqZkSqE7R9tRfN8G3fVpiiNIAJlX8rbN3VwxaoHi1B1sSMn/Q==
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -1126,10 +1126,10 @@ electron-rebuild@^1.11.0:
     spawn-rx "^3.0.0"
     yargs "^14.2.0"
 
-electron@^9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-9.1.1.tgz#d52c9873be4113287c3eb2b02f85bad6644b100e"
-  integrity sha512-BYvroBLV9x7G4iN33P/IxeZqwjl62/9VuBAF1CoM0m6OeheaiLog1ZMKLlCqVXycJvvrAvLHc454DDEmwnqqhA==
+electron@^9.0.5:
+  version "9.0.5"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-9.0.5.tgz#189ee117cc2a2777cccf40fae0766acec5faae57"
+  integrity sha512-bnL9H48LuQ250DML8xUscsKiuSu+xv5umXbpBXYJ0BfvYVmFfNbG3jCfhrsH7aP6UcQKVxOG1R/oQExd0EFneQ==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"
@@ -1935,10 +1935,10 @@ lodash.assign@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
   integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
-lodash@^4.17.10, lodash@^4.17.19:
-  version "4.17.19"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
-  integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
+lodash@^4.17.10, lodash@^4.17.15:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
 log-symbols@^2.2.0:
   version "2.2.0"
@@ -2869,10 +2869,10 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-sweetalert2@^9.17.0:
-  version "9.17.0"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.17.0.tgz#9ea457f3c44295a3629ed5998fee6a51940c3891"
-  integrity sha512-tOby96N1FlTT8Xi7Y7QlTiswNJTySgghmRSyFwb3pO3zdrhsR2PUp4ucmye7a3CTLbLdqjHdszsGlCJ0v6pGaQ==
+sweetalert2@^9.15.2:
+  version "9.15.2"
+  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.15.2.tgz#d26f1e6dee91d9ff57b3b98b3d92a0d6c3fa6fc1"
+  integrity sha512-evJfoa49s5ZzSmVc62tslNkzlQoCg2GHjB3MQxawfESppvY5AlXKLGQ3nNKxHXKdodKmIHbkl39DgUhcOK7LgQ==
 
 system-font-families@^0.4.1:
   version "0.4.1"