fix

app/css/acct.css

@@ -0,0 +1,76 @@
+.acct {
+	display: flex;
+	justify-content: space-around;
+}
+
+.card {
+	width: 400px;
+	background-color: #494949;
+	margin: 10px;
+}
+
+body,
+html {
+	overflow-y: scroll;
+}
+
+#acct-list {
+	display: flex;
+	flex-wrap: wrap;
+	color: white;
+	align-items: flex-start;
+}
+
+.lts {
+	font-size: 150%;
+}
+
+.colorsel {
+	display: flex;
+}
+
+.card .colorsel div:not(.exc) {
+	width: 20px;
+	height: 20px;
+}
+
+.card .colorsel div.exc {
+	width: 40px;
+	height: 20px;
+}
+
+.first {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+
+.first .hide-first {
+	display: none;
+}
+
+#compt {
+	margin-top: 20px;
+	margin-bottom: 50px;
+	border: 1px solid;
+	border: 1px solid;
+	padding: 5px;
+}
+
+#compt li {
+	list-style-type: disc;
+	margin-left: 20px;
+}
+
+#domain-list {
+    width: 500px;
+    max-width: 100%;
+}
+
+i.left {
+    margin-right: 5px;
+}
+
+#domain-list .title {
+   font-size: 1.3rem;
+}

app/css/tl.css

@@ -374,6 +374,31 @@ iframe,
 	grid-area: side;
 }
 
+.cusr {
+	user-select: text;
+	padding-left: 5px;
+	border-bottom: 0.5px solid;
+	padding-right: 2px;
+	word-break: break-word;
+	width: 100%;
+	display: grid;
+	grid-template-columns: 43px 2fr 1fr;
+	grid-template-rows: auto 1.6rem 2fr auto;
+	grid-template-areas: 'notice notice notice' 'icon display_name display_name' 'space status status' 'space actions actions';
+}
+
+.area-status {
+	grid-area: status;
+	display: flex;
+	flex-wrap: wrap;
+	margin-bottom: 5px;
+}
+
+.cusr .cbadge {
+	margin-top: 6px;
+	margin-left: 6px;
+}
+
 .quote-inline {
 	display: none;
 }
@@ -760,6 +785,7 @@ audio {
 	padding-right: 3px;
 	border-radius: 3px;
 	border: 1px solid var(--color);
+	user-select: none;
 }
 .vis-data {
 	font-size: 1rem !important;

app/js/login/manager.js

@@ -33,7 +33,9 @@ function load() {
 	}
 
 	console.table(obj)
+	var domains = []
 	var templete
+	$('#acct-list').html('')
 	Object.keys(obj).forEach(function(key) {
 		var acct = obj[key]
 		var list = key * 1 + 1
@@ -47,6 +49,7 @@ function load() {
 		} else {
 			var name = acct.user
 		}
+		domains.push(acct.domain)
 		templete = `
 		<div id="acct_${key}" class="card" ${style}>
 			<div class="card-content ">
@@ -54,15 +57,12 @@ function load() {
 				<span class="card-title">${name}</span>${escapeHTML(acct.user)}@${acct.domain}
 			</div>
 			<div class="card-action">
-				<a class="waves-effect disTar pointer white-text" onclick="data('${acct.domain}')">
+				<button class="btn-flat waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
-					<i class="material-icons">info</i>${lang.lang_manager_info}
+					<i class="material-icons left">refresh</i>${lang.lang_manager_refresh}
-				</a>
+				</button>
-				<a class="waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
+				<button class="btn-flat waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
-					<i class="material-icons">refresh</i>${lang.lang_manager_refresh}
+					<i class="material-icons left">delete</i>${lang.lang_manager_delete}
-				</a>
+				</button><br />${lang.lang_manager_color}
-				<a class="waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
-					<i class="material-icons">delete</i>${lang.lang_manager_delete}"
-				</a><br />${lang.lang_manager_color}
 				<div id="colorsel_${key}" class="colorsel"></div>
 			</div>
 		</div>
@@ -70,6 +70,30 @@ function load() {
 		$('#acct-list').append(templete)
 		colorpicker(key)
 	})
+	domains = _.uniq(domains)
+	$('#domain-list').html('')
+	Object.keys(domains).forEach(function(key2) {
+		var domain = domains[key2]
+		if (localStorage.getItem('letters_' + key2)) {
+			var maxChars = localStorage.getItem('letters_' + key2)
+		} else {
+			var maxChars = 500
+		}
+		var templete = `
+	<li class="collection-item transparent">
+		<div>
+			<p class="title">${domain}</p>
+			${lang.lang_manager_maxChars}　<input style="width: 100px" value="${maxChars}" id="maxChars${key2}">
+			<button class="btn-flat waves-effect" onclick="maxChars('${domain}', '${key2}')">
+				<i class="material-icons">send</i>
+			</button>
+			<button class="btn-flat waves-effect secondary-content" onclick="data('${domain}', '${key2}')">
+				<i class="material-icons left">info</i>${lang.lang_manager_info}
+			</button>
+		</div></li>
+		`
+		$('#domain-list').append(templete)
+	})
 	multisel()
 	var acctN = localStorage.getItem('acct')
 	if (!acctN) {
@@ -82,9 +106,35 @@ function load() {
 //最初に読む
 load()
 support()
-
+function maxChars(domain, uid) {
+	var value = $('#maxChars' + uid).val()
+	if(value*1 < 1 || !Number.isInteger(value*1)) {
+		Swal.fire({
+			type: 'error',
+			title: 'Error'
+		})
+		return false
+	}
+	var multi = localStorage.getItem('multi')
+	if (!multi) {
+		var obj = []
+	} else {
+		var obj = JSON.parse(multi)
+	}
+	if (obj[0]) {
+		if (!obj[0].at) {
+			obj = []
+			localStorage.removeItem('multi')
+		}
+	}
+	Object.keys(obj).forEach(function(key) {
+		if(obj[key].domain == domain) localStorage.setItem('letters_' + key, value)
+	})
+	console.log('#maxChars' + uid, value)
+	load()
+}
 //instances.social/instances API
-function data(domain) {
+async function data(domain, acct_id) {
 	$('#ins-upd').text('Loading...')
 	$('#ins-add').text('Loading...')
 	$('#ins-connect').text('Loading...')
@@ -96,7 +146,7 @@ function data(domain) {
 	$('#ins-name').text('Loading...')
 	$('#ins-prof').attr('src', '../../img/loading.svg')
 	var start = 'https://instances.social/api/1.0/instances/show?name=' + domain
-	fetch(start, {
+	let promise = await fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json',
@@ -104,74 +154,42 @@ function data(domain) {
 				'Bearer tC8F6xWGWBUwGScyNevYlx62iO6fdQ4oIK0ad68Oo7ZKB8GQdGpjW9TKxBnIh8grAhvd5rw3iyP9JPamoDpeLQdz62EToPJUW99hDx8rfuJfGdjQuimZPTbIOx0woA5M'
 		}
 	})
-		.then(function(response) {
+	var json = await promise.json()
-			if (!response.ok) {
+	$('#ins-name').text(json.name)
-				response.text().then(function(text) {
+	$('#ins-upd').text(date(json.checked_at, 'full'))
-					setLog(response.url, response.status, text)
+	$('#ins-add').text(date(json.added_at, 'full'))
-				})
+	$('#ins-connect').text(json.connections)
-			}
+	$('#ins-toot').text(json.statuses)
-			return response.json()
+	$('#ins-sys').text(date(json.updated_at, 'full'))
-		})
+	$('#ins-per').text(json.uptime * 100)
-		.catch(function(error) {
+	$('#ins-user').text(json.users)
-			todo(error)
+	$('#ins-ver').text(json.version)
-			setLog(start, 'JSON', error)
-			console.error(error)
-		})
-		.then(function(json) {
-			if (!json.error) {
-				$('#ins-name').text(json.name)
-				$('#ins-upd').text(date(json.checked_at, 'full'))
-				$('#ins-add').text(date(json.added_at, 'full'))
-				$('#ins-connect').text(json.connections)
-				$('#ins-toot').text(json.statuses)
-				$('#ins-sys').text(date(json.updated_at, 'full'))
-				$('#ins-per').text(json.uptime * 100)
-				$('#ins-user').text(json.users)
-				$('#ins-ver').text(json.version)
-			} else {
-				console.error(json.error)
-			}
-		})
 	var start = 'https://' + domain + '/api/v1/instance'
-	fetch(start, {
+	let promise2 = await fetch(start, {
 		method: 'GET',
 		headers: {
 			'content-type': 'application/json'
 		}
 	})
-		.then(function(response) {
+	var json = await promise2.json()
-			if (!response.ok) {
+	$('#ins-title').text(json.title)
-				response.text().then(function(text) {
+	$('#ins-desc').html(json.description)
-					setLog(response.url, response.status, text)
+	$('#ins-email').text(json.email)
-				})
+	$('#ins-toot').text(json.stats.status_count)
-			}
+	$('#ins-user').text(json.stats.user_count)
-			return response.json()
+	$('#ins-ver').text(json.version)
-		})
+	$('#ins-prof').attr('src', json.thumbnail)
-		.catch(function(error) {
+	$('#ins-admin').text(
-			todo(error)
+		escapeHTML(json.contact_account.display_name) + '(' + json.contact_account.acct + ')'
-			setLog(start, 'JSON', error)
+	)
-			console.error(error)
+	$('#ins-admin').attr(
-		})
+		'href',
-		.then(function(json) {
+		'index.html?mode=user&code=' + json.contact_account.username + '@' + domain
-			if (!json.error) {
+	)
-				$('#ins-title').text(json.title)
+	if (json['max_toot_chars']) {
-				$('#ins-desc').html(json.description)
+		localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
-				$('#ins-email').text(json.email)
+		load()
-				$('#ins-toot').text(json.stats.status_count)
+	}
-				$('#ins-user').text(json.stats.user_count)
-				$('#ins-ver').text(json.version)
-				$('#ins-prof').attr('src', json.thumbnail)
-				$('#ins-admin').text(
-					escapeHTML(json.contact_account.display_name) + '(' + json.contact_account.acct + ')'
-				)
-				$('#ins-admin').attr(
-					'href',
-					'index.html?mode=user&code=' + json.contact_account.username + '@' + domain
-				)
-			} else {
-				console.error(json.error)
-			}
-		})
 }
 
 //アカウントデータ　消す

app/js/post/bb-md.js

@@ -50,7 +50,12 @@ function mdCheck() {
 	if (idata[domain + '_letters']) {
 		$('#textarea').attr('data-length', idata[domain + '_letters'])
 	} else {
-		$('#textarea').attr('data-length', 500)
+		var maxletters = localStorage.getItem('letters_' + acct_id)
+		if (maxletters > 0) {
+			$('#textarea').attr('data-length', maxletters)
+		} else {
+			$('#textarea').attr('data-length', 500)
+		}
 	}
 	if (idata[domain + '_glitch'] === 'true') {
 		$('#local-button').removeClass('hide')

app/js/post/img.js

@@ -94,7 +94,6 @@ function media(b64, type, no, stamped) {
 		postMessage(['stampImage', [b64, user + '@' + domain]], '*')
 		return false
 	}
-	console.log(b64)
 	var l = 4
 	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
 	var cl = c.length

app/js/tl/filter.js

@@ -514,6 +514,7 @@ function resetNotfFilter(tlid) {
 }
 function notfFilter(id, tlid, acct_id) {
 	var excludetxt = localStorage.getItem('exclude-' + tlid)
+	console.log(excludetxt)
 	if (excludetxt || excludetxt != '') {
 		excludetxt = excludetxt + '&account_id=' + id
 	} else {

app/js/tl/notification.js

@@ -70,12 +70,14 @@ function notfColumn(acct_id, tlid, sys) {
 					}
 					var mute = getFilterTypeByAcct(acct_id, 'notif')
 					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
-					if (obj.type != 'follow' && obj.type != 'move') {
+					if (obj.type != 'follow' && obj.type != 'move' && obj.type != 'follow_request') {
 						if (misskey) {
 							templete = templete + misskeyParse([obj], 'notf', acct_id, tlid, -1, mute)
 						} else {
 							templete = templete + parse([obj], 'notf', acct_id, tlid, -1, mute)
 						}
+					} else if (obj.type == 'follow_request') {
+						templete = templete + userparse([obj.account], 'request', acct_id, tlid, -1)
 					} else {
 						if (misskey) {
 							templete = templete + misskeyUserparse([obj], 'notf', acct_id, tlid, -1, mute)

app/js/tl/parse.js

@@ -1060,7 +1060,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</a>
 					</div>
 					<div class="action ${can_rt} ${disp['rt']} ${noauth}">
-						<a onclick="rt('${toot.id}','${acct_id}','${tlid}')" class="waves-effect waves-dark btn-flat actct bt-btn"
+						<a onclick="rt('${
+							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="rt_ct">${toot.reblogs_count}</span>
@@ -1199,6 +1201,8 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					}
 				} else if (auth == 'moved') {
 					var ftxt = lang.lang_parse_moved
+				} else if (auth == 'request') {
+					var ftxt = lang.lang_parse_request
 				}
 				console.log(auth, ftxt)
 				if (popup > 0 || popup == -1 || notf) {
@@ -1281,7 +1285,7 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				}
 				templete =
 					templete +
-					`<div class="cvo" style="padding-top:5px;" user-id="${toot.id}">
+					`<div class="cusr" style="padding-top:5px;" user-id="${toot.id}">
 					<div class="area-notice">${notftext}</div>
 					<div class="area-icon">
 						${udg}
@@ -1301,21 +1305,20 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 								class="sml gray"
 								style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;user-select:auto; cursor:text;"
 							>
-								@ ${toot.acct}${locked}</span
+								@ ${toot.acct}${locked}</span>
-							>
 						</div>
 					</div>
-					<div class="area-toot acct-note">
+					<div class="area-status">
-						${toot.note.replace(/<br\s?\/?>.+/g, '<span class="gray">...</span>')}
-					</div>
-					<div style="justify-content:space-around;top:5px" class="area-actions">
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_follow}:${toot.following_count}
 						</div>
 						<div class="cbadge" style="width:100px;">
 							${lang.lang_status_followers}:${toot.followers_count}
 						</div>
-						${latesthtml}${authhtml}
+						${latesthtml}
+					</div>
+					<div class="area-actions" style="justify-content: flex-end;">
+						${authhtml}
 					</div>
 				</div>
 				`

app/js/ui/settings.js

@@ -787,6 +787,15 @@ function asReadEnd() {
 	postMessage(['asReadComp', ''], '*')
 }
 function checkupd() {
+	if (
+		localStorage.getItem('winstore') == 'brewcask' ||
+		localStorage.getItem('winstore') == 'snapcraft' ||
+		localStorage.getItem('winstore') == 'winstore'
+	) {
+		var winstore = true
+	} else {
+		var winstore = false
+	}
 	var ver = localStorage.getItem('ver')
 	var start = 'https://thedesk.top/ver.json'
 	fetch(start, {

app/js/ui/theme.js

@@ -1,32 +1,33 @@
 //テーマ適用
 function themes(theme) {
 	if (!theme) {
-		var theme = localStorage.getItem("theme");
+		var theme = localStorage.getItem('theme')
 		if (!theme) {
-			var theme = "black";
+			var theme = 'black'
-			localStorage.setItem("theme", "black");
+			localStorage.setItem('theme', 'black')
 		}
 	}
-	var el = document.getElementsByTagName("html")[0]
+	var el = document.getElementsByTagName('html')[0]
 
-	el.classList.remove('indigotheme');
+	el.classList.remove('indigotheme')
-	el.classList.remove('greentheme');
+	el.classList.remove('greentheme')
-	el.classList.remove('browntheme');
+	el.classList.remove('browntheme')
-	el.classList.remove('blacktheme');
+	el.classList.remove('blacktheme')
-	el.classList.remove('bluetheme');
+	el.classList.remove('bluetheme')
-	el.classList.remove('customtheme');
+	el.classList.remove('customtheme')
-	el.classList.add(theme + "theme");
+	el.classList.add(theme + 'theme')
-	var font = localStorage.getItem("font");
+	var font = localStorage.getItem('font')
 	if (font) {
-		el.style.fontFamily = font;
+		font = font.replace(/"(.+)"/, '$1')
+		el.style.fontFamily = '"' + font + '"'
 	} else {
-		el.style.fontFamily = "";
+		el.style.fontFamily = ''
 	}
-	if (theme == "custom") {
+	if (theme == 'custom') {
-		if (localStorage.getItem("customtheme-id")) {
+		if (localStorage.getItem('customtheme-id')) {
-			postMessage(["themeCSSRequest", localStorage.getItem("customtheme-id")], "*")
+			postMessage(['themeCSSRequest', localStorage.getItem('customtheme-id')], '*')
 		}
 	}
-	el.style.backgroundColor = "var(--bg)";
+	el.style.backgroundColor = 'var(--bg)'
 }
-themes();
+themes()

app/main.js

@@ -12,6 +12,7 @@ const np = require('./main/np.js')
 const systemFunc = require('./main/system.js')
 const Menu = electron.Menu
 const join = require('path').join
+const windowStateKeeper = require('electron-window-state')
 
 // アプリケーションをコントロールするモジュール
 const app = electron.app
@@ -58,10 +59,10 @@ if (process.argv.indexOf('--dev') === -1) {
 	console.log('Welcome!')
 }
 var info_path = join(app.getPath('userData'), 'window-size.json')
-var max_info_path = join(app.getPath('userData'), 'max-window-size.json')
 var lang_path = join(app.getPath('userData'), 'language')
 var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
 var ua_path = join(app.getPath('userData'), 'useragent')
+
 try {
 	fs.readFileSync(ha_path, 'utf8')
 	app.disableHardwareAcceleration()
@@ -69,26 +70,6 @@ try {
 } catch {
 	if (!packaged) console.log('enabled: Hardware Acceleration')
 }
-var window_size
-try {
-	window_size = JSON.parse(fs.readFileSync(info_path, 'utf8'))
-} catch (e) {
-	window_size = {
-		width: 1000,
-		height: 750
-	} // デフォルトバリュー
-}
-var max_window_size
-try {
-	max_window_size = JSON.parse(fs.readFileSync(max_info_path, 'utf8'))
-} catch (e) {
-	max_window_size = {
-		width: 'string',
-		height: 'string',
-		x: 'string',
-		y: 'string'
-	} // デフォルトバリュー
-}
 function isFile(file) {
 	try {
 		fs.statSync(file)
@@ -103,6 +84,10 @@ app.on('window-all-closed', function() {
 	app.quit()
 })
 function createWindow() {
+	let window_size = windowStateKeeper({
+		defaultWidth: 1000,
+		defaultHeight: 750
+	  })
 	if (isFile(lang_path)) {
 		var lang = fs.readFileSync(lang_path, 'utf8')
 	} else {
@@ -177,7 +162,7 @@ function createWindow() {
 	mainWindow = new BrowserWindow(arg)
 	mainWindow.once('page-title-updated', () => {
 		mainWindow.show()
-		if (window_size.max) {
+		if (window_size.isMaximized) {
 			mainWindow.maximize()
 		}
 	})
@@ -215,9 +200,7 @@ function createWindow() {
 				.substring(0, N)
 	}
 	mainWindow.loadURL(base + lang + '/index.html' + plus, { userAgent: ua })
-	if (!window_size.x && !window_size.y) {
+	window_size.manage(mainWindow)
-		mainWindow.center()
-	}
 	// ウィンドウが閉じられたらアプリも終了
 	mainWindow.on('closed', function() {
 		electron.ipcMain.removeAllListeners()
@@ -225,7 +208,6 @@ function createWindow() {
 	})
 	closeArg = false
 	mainWindow.on('close', function(e, arg) {
-		writePos(mainWindow)
 		if (!closeArg) {
 			e.preventDefault()
 		}
@@ -244,36 +226,7 @@ function createWindow() {
 		closeArg = true
 		mainWindow.close()
 	})
-	function writePos(mainWindow) {
-		if (
-			max_window_size.width == mainWindow.getBounds().width &&
-			max_window_size.height == mainWindow.getBounds().height &&
-			max_window_size.x == mainWindow.getBounds().x &&
-			max_window_size.y == mainWindow.getBounds().y
-		) {
-			var size = {
-				width: mainWindow.getBounds().width,
-				height: mainWindow.getBounds().height,
-				x: mainWindow.getBounds().x,
-				y: mainWindow.getBounds().y,
-				max: true
-			}
-		} else {
-			var size = {
-				width: mainWindow.getBounds().width,
-				height: mainWindow.getBounds().height,
-				x: mainWindow.getBounds().x,
-				y: mainWindow.getBounds().y
-			}
-		}
-		fs.writeFileSync(info_path, JSON.stringify(size))
-	}
-	mainWindow.on('maximize', function() {
-		writePos(mainWindow)
-		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()))
-	})
 	mainWindow.on('minimize', function() {
-		writePos(mainWindow)
 		mainWindow.webContents.send('asRead', '')
 	})
 

app/main/system.js

@@ -1,301 +1,365 @@
 function system(mainWindow, dir, lang, dirname) {
-	const electron = require("electron");
+	const electron = require('electron')
-	const app = electron.app;
+	const app = electron.app
-	const join = require("path").join;
+	const join = require('path').join
-	var Jimp = require("jimp");
+	var Jimp = require('jimp')
-	const fs = require("fs");
+	const fs = require('fs')
-	var JSON5 = require("json5");
+	var JSON5 = require('json5')
-	var ipc = electron.ipcMain;
+	var ipc = electron.ipcMain
-	const clipboard = electron.clipboard;
+	const clipboard = electron.clipboard
-	var tmp_img = join(app.getPath("userData"), "tmp.png");
+	var tmp_img = join(app.getPath('userData'), 'tmp.png')
-	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
+	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
-	var ua_path = join(app.getPath("userData"), "useragent");
+	var ua_path = join(app.getPath('userData'), 'useragent')
-	var lang_path = join(app.getPath("userData"), "language");
+	var lang_path = join(app.getPath('userData'), 'language')
-	var log_dir_path = join(app.getPath("userData"), "logs");
+	var log_dir_path = join(app.getPath('userData'), 'logs')
 	//ログ
-	var today = new Date();
+	var today = new Date()
 	//今日のやつ
-	var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	var todayStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 	//昨日のやつ
-	today.setDate(today.getDate() - 1);
+	today.setDate(today.getDate() - 1)
-	var yestStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	var yestStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 	//一昨日のやつ
-	today.setDate(today.getDate() - 1);
+	today.setDate(today.getDate() - 1)
-	var yest2Str = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	var yest2Str = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 
-	const BrowserWindow = electron.BrowserWindow;
+	const BrowserWindow = electron.BrowserWindow
-	const dialog = electron.dialog;
+	const dialog = electron.dialog
-	const os = require("os");
+	const os = require('os')
-	const language = require("../main/language.js");
+	const language = require('../main/language.js')
 	//プラットフォーム
-	ipc.on("getPlatform", function(e, arg) {
+	ipc.on('getPlatform', function(e, arg) {
 		try {
-			var gitHash = fs.readFileSync("git", "utf8");
+			var gitHash = fs.readFileSync('git', 'utf8')
 		} catch {
-			var gitHash = null;
+			var gitHash = null
 		}
-		e.sender.webContents.send("platform", [process.platform, process.arch, process.version, process.versions.chrome, process.versions.electron, gitHash]);
+		e.sender.webContents.send('platform', [
-	});
+			process.platform,
+			process.arch,
+			process.version,
+			process.versions.chrome,
+			process.versions.electron,
+			gitHash
+		])
+	})
 	//言語
-	ipc.on("lang", function(e, arg) {
+	ipc.on('lang', function(e, arg) {
-		console.log("set:" + arg);
+		console.log('set:' + arg)
-		fs.writeFileSync(lang_path, arg);
+		fs.writeFileSync(lang_path, arg)
-		e.sender.webContents.send("langres", arg);
+		e.sender.webContents.send('langres', arg)
-	});
+	})
 	//エクスポートのダイアログ
-	ipc.on("exportSettings", function(e, args) {
+	ipc.on('exportSettings', function(e, args) {
 		dialog.showSaveDialog(
 			mainWindow,
 			{
-				title: "Export",
+				title: 'Export',
-				properties: ["openFile", "createDirectory"],
+				properties: ['openFile', 'createDirectory'],
-				defaultPath: "export.thedeskconfig.json5"
+				defaultPath: 'export.thedeskconfig.json5'
 			},
 			savedFiles => {
 				if (!savedFiles) {
-					return false;
+					return false
 				}
-				e.sender.webContents.send("exportSettingsFile", savedFiles);
+				e.sender.webContents.send('exportSettingsFile', savedFiles)
 			}
-		);
+		)
-	});
+	})
 	//インポートのダイアログ
-	ipc.on("importSettings", function(e, args) {
+	ipc.on('importSettings', function(e, args) {
 		dialog.showOpenDialog(
 			mainWindow,
 			{
-				title: "Import",
+				title: 'Import',
-				properties: ["openFile"],
+				properties: ['openFile'],
-				filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
+				filters: [
+					{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2', 'json5'] }
+				]
 			},
 			fileNames => {
-				console.log("imported from: ", fileNames)
+				console.log('imported from: ', fileNames)
 				if (!fileNames) {
-					return false;
+					return false
 				}
-				e.sender.webContents.send("config", JSON5.parse(fs.readFileSync(fileNames[0], "utf8")));
+				e.sender.webContents.send('config', JSON5.parse(fs.readFileSync(fileNames[0], 'utf8')))
 			}
-		);
+		)
-	});
+	})
 	//保存フォルダのダイアログ
-	ipc.on("savefolder", function(e, args) {
+	ipc.on('savefolder', function(e, args) {
 		dialog.showOpenDialog(
 			mainWindow,
 			{
-				title: "Save folder",
+				title: 'Save folder',
-				properties: ["openDirectory"]
+				properties: ['openDirectory']
 			},
 			fileNames => {
-				e.sender.webContents.send("savefolder", fileNames[0]);
+				e.sender.webContents.send('savefolder', fileNames[0])
 			}
-		);
+		)
-	});
+	})
 	//カスタムサウンドのダイアログ
-	ipc.on("customSound", function(e, arg) {
+	ipc.on('customSound', function(e, arg) {
 		dialog.showOpenDialog(
 			mainWindow,
 			{
-				title: "Custom sound",
+				title: 'Custom sound',
-				properties: ["openFile"],
+				properties: ['openFile'],
-				filters: [{ name: "Audio", extensions: ["mp3", "aac", "wav", "flac", "m4a"] }, { name: "All", extensions: ["*"] }]
+				filters: [
+					{ name: 'Audio', extensions: ['mp3', 'aac', 'wav', 'flac', 'm4a'] },
+					{ name: 'All', extensions: ['*'] }
+				]
 			},
 			fileNames => {
-				e.sender.webContents.send("customSoundRender", [arg, fileNames[0]]);
+				e.sender.webContents.send('customSoundRender', [arg, fileNames[0]])
 			}
-		);
+		)
-	});
+	})
 
 	//ハードウェアアクセラレーションの無効化
-	ipc.on("ha", function(e, arg) {
+	ipc.on('ha', function(e, arg) {
-		if (arg == "true") {
+		if (arg == 'true') {
-			fs.writeFileSync(ha_path, arg);
+			fs.writeFileSync(ha_path, arg)
 		} else {
-			fs.unlink(ha_path, function(err) {});
+			fs.unlink(ha_path, function(err) {})
 		}
-		app.relaunch();
+		app.relaunch()
-		app.exit();
+		app.exit()
-	});
+	})
-	ipc.on("ua", function(e, arg) {
+	ipc.on('ua', function(e, arg) {
-		if (arg == "") {
+		if (arg == '') {
-			fs.unlink(ua_path, function(err) {});
+			fs.unlink(ua_path, function(err) {})
 		} else {
-			fs.writeFileSync(ua_path, arg);
+			fs.writeFileSync(ua_path, arg)
 		}
-		app.relaunch();
+		app.relaunch()
-		app.exit();
+		app.exit()
-	});
+	})
 
-	ipc.on("quit", (e, args) => {
+	ipc.on('quit', (e, args) => {
-		app.quit();
+		app.quit()
-	});
+	})
-	ipc.on("about", (e, args) => {
+	ipc.on('about', (e, args) => {
-		about();
+		about()
-	});
+	})
 	function about() {
-		var ver = app.getVersion();
+		var ver = app.getVersion()
 		var window = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(dirname, "js", "platform", "preload.js")
+				preload: join(dirname, 'js', 'platform', 'preload.js')
 			},
 			width: 300,
 			height: 500,
 			transparent: false, // ウィンドウの背景を透過
 			frame: false, // 枠の無いウィンドウ
 			resizable: false
-		});
+		})
-		window.loadURL(dir + "/about.html?ver=" + ver);
+		window.loadURL(dir + '/about.html?ver=' + ver)
-		return "true";
+		return 'true'
 	}
-	ipc.on("nano", function(e, x, y) {
+	ipc.on('nano', function(e, x, y) {
-		var nano_info_path = join(app.getPath("userData"), "nano-window-position.json");
+		var nano_info_path = join(app.getPath('userData'), 'nano-window-position.json')
-		var window_pos;
+		var window_pos
 		try {
-			window_pos = JSON.parse(fs.readFileSync(nano_info_path, "utf8"));
+			window_pos = JSON.parse(fs.readFileSync(nano_info_path, 'utf8'))
 		} catch (e) {
-			window_pos = [0, 0]; // デフォルトバリュー
+			window_pos = [0, 0] // デフォルトバリュー
 		}
 		var nanowindow = new BrowserWindow({
 			webPreferences: {
 				webviewTag: false,
 				nodeIntegration: false,
 				contextIsolation: true,
-				preload: join(dirname, "js", "platform", "preload.js")
+				preload: join(dirname, 'js', 'platform', 'preload.js')
 			},
 			width: 350,
 			height: 140,
 			transparent: false, // ウィンドウの背景を透過
 			frame: false, // 枠の無いウィンドウ
 			resizable: false
-		});
+		})
-		nanowindow.loadURL(dir + "/nano.html");
+		nanowindow.loadURL(dir + '/nano.html')
-		nanowindow.setAlwaysOnTop(true);
+		nanowindow.setAlwaysOnTop(true)
 		//nanowindow.toggleDevTools()
-		nanowindow.setPosition(window_pos[0], window_pos[1]);
+		nanowindow.setPosition(window_pos[0], window_pos[1])
-		nanowindow.on("close", function() {
+		nanowindow.on('close', function() {
-			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
+			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()))
-		});
+		})
-		return true;
+		return true
-	});
+	})
-	var cbTimer1;
+	var cbTimer1
-	ipc.on("startmem", (e, arg) => {
+	ipc.on('startmem', (e, arg) => {
-		event = e.sender;
+		event = e.sender
-		cbTimer1 = setInterval(mems, 1000);
+		cbTimer1 = setInterval(mems, 1000)
-	});
+	})
 	function mems() {
-		var mem = os.totalmem() - os.freemem();
+		var mem = os.totalmem() - os.freemem()
 		if (mainWindow) {
-			event.webContents.send("memory", [mem, os.cpus()[0].model, os.totalmem()]);
+			event.webContents.send('memory', [mem, os.cpus()[0].model, os.totalmem()])
 		}
 	}
-	ipc.on("endmem", (e, arg) => {
+	ipc.on('endmem', (e, arg) => {
 		if (cbTimer1) {
-			clearInterval(cbTimer1);
+			clearInterval(cbTimer1)
 		}
-	});
+	})
 
-	ipc.on("export", (e, args) => {
+	ipc.on('export', (e, args) => {
-		fs.writeFileSync(args[0], JSON5.stringify(args[1]));
+		fs.writeFileSync(args[0], JSON5.stringify(args[1]))
-		e.sender.webContents.send("exportAllComplete", "");
+		e.sender.webContents.send('exportAllComplete', '')
-	});
+	})
 	//フォント
 	function object_array_sort(data, key, order, fn) {
 		//デフォは降順(DESC)
-		var num_a = -1;
+		var num_a = -1
-		var num_b = 1;
+		var num_b = 1
 
-		if (order === "asc") {
+		if (order === 'asc') {
 			//指定があれば昇順(ASC)
-			num_a = 1;
+			num_a = 1
-			num_b = -1;
+			num_b = -1
 		}
 
 		data = data.sort(function(a, b) {
-			var x = a[key];
+			var x = a[key]
-			var y = b[key];
+			var y = b[key]
-			if (x > y) return num_a;
+			if (x > y) return num_a
-			if (x < y) return num_b;
+			if (x < y) return num_b
-			return 0;
+			return 0
-		});
+		})
 
 		//重複排除
-		var arrObj = {};
+		var arrObj = {}
 		for (var i = 0; i < data.length; i++) {
-			arrObj[data[i]["family"]] = data[i];
+			arrObj[data[i]['family']] = data[i]
 		}
 
-		data = [];
+		data = []
 		for (var key in arrObj) {
-			data.push(arrObj[key]);
+			data.push(arrObj[key])
 		}
 
-		fn(data); // ソート後の配列を返す
+		fn(data) // ソート後の配列を返す
 	}
-	ipc.on("fonts", (e, arg) => {
+	ipc.on('fonts', (e, arg) => {
-		const fm = require("font-manager");
+		const fm = require('font-manager')
-		var fonts = fm.getAvailableFontsSync();
+		var fonts = fm.getAvailableFontsSync()
-		object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
+		object_array_sort(fonts, 'family', 'asc', function(fonts_sorted) {
-			e.sender.webContents.send("font-list", fonts_sorted);
+			e.sender.webContents.send('font-list', fonts_sorted)
-		});
+		})
-	});
+	})
 	//コピー
-	ipc.on("copy", (e, arg) => {
+	ipc.on('copy', (e, arg) => {
-		clipboard.writeText(arg);
+		clipboard.writeText(arg)
-	});
+	})
 	//ログ
-	ipc.on("log", (e, arg) => {
+	ipc.on('log', (e, arg) => {
-		var today = new Date();
+		var today = new Date()
-		var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate();
+		var todayStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate()
-		var log_path = join(log_dir_path, todayStr + ".log");
+		var log_path = join(log_dir_path, todayStr + '.log')
-		fs.appendFile(log_path, "\n" + arg, function(err) {
+		fs.appendFile(log_path, '\n' + arg, function(err) {
 			if (err) {
-				throw err;
+				throw err
 			}
-		});
+		})
-	});
+	})
-	ipc.on("getLogs", (e, arg) => {
+	ipc.on('getLogs', (e, arg) => {
-		var logs=""
+		var logs = ''
-		var todayLog=""
+		var todayLog = ''
-		var yestLog=""
+		var yestLog = ''
-		var yest2Log=""
+		var yest2Log = ''
 		fs.readdir(log_dir_path, function(err, files) {
-			if (err) throw err;
+			if (err) throw err
 			files.filter(function(file) {
 				if (file == todayStr) {
-					todayLog=fs.readFileSync(join(log_dir_path, file), "utf8")
+					todayLog = fs.readFileSync(join(log_dir_path, file), 'utf8')
 				}
 				if (file == yestStr) {
-					yestLog=logs+fs.readFileSync(join(log_dir_path, file), "utf8")
+					yestLog = logs + fs.readFileSync(join(log_dir_path, file), 'utf8')
 				}
 				if (file == yest2Str) {
-					yest2Log=fs.readFileSync(join(log_dir_path, file), "utf8")
+					yest2Log = fs.readFileSync(join(log_dir_path, file), 'utf8')
 				}
-				logs = todayLog + yestLog + yest2Log;
+				logs = todayLog + yestLog + yest2Log
-			});
+			})
-			logs = yest2Log + yestLog + todayLog;
+			logs = yest2Log + yestLog + todayLog
-			e.sender.webContents.send("logData", logs);
+			e.sender.webContents.send('logData', logs)
-		});
+		})
-	});
+	})
 	//起動時ログディレクトリ存在確認と作成、古ログ削除
 	fs.access(log_dir_path, fs.constants.R_OK | fs.constants.W_OK, error => {
 		if (error) {
-			if (error.code === "ENOENT") {
+			if (error.code === 'ENOENT') {
-				fs.mkdirSync(log_dir_path);
+				fs.mkdirSync(log_dir_path)
 			} else {
-				return;
+				return
 			}
 		} else {
 			fs.readdir(log_dir_path, function(err, files) {
-				if (err) throw err;
+				if (err) throw err
 				files.filter(function(file) {
 					if (file != todayStr && file != yestStr && file != yest2Str) {
-						fs.unlinkSync(join(log_dir_path, file));
+						fs.unlinkSync(join(log_dir_path, file))
 					}
-				});
+				})
-			});
+			})
 		}
-	});
+	})
+	var $ = require('nodobjc')
+
+	$.framework('Foundation')
+	$.framework('AppKit')
+
+	var GetSongs = $.NSObject.extend('Delegate')
+
+	GetSongs.addMethod('getMySongs:', 'v@:@', function(self, _cmd, notif) {
+		var userInfo = notif('userInfo')
+		var keys = userInfo('keyEnumerator')
+		var key
+		var song = {}
+
+		while ((key = keys('nextObject'))) {
+			var value = userInfo('objectForKey', key)
+			song[key.toString()] = value.toString()
+		}
+		console.log(song)
+	})
+
+	GetSongs.register()
+
+	var gs = GetSongs('alloc')('init')
+	var nc = $.NSDistributedNotificationCenter('defaultCenter')
+	var selector = $.NSSelectorFromString($('getMySongs:'))
+	var notification = $('com.apple.iTunes.playerInfo')
+
+	nc('addObserver', gs, 'selector', 'getMySongs:', 'name', notification, 'object', null)
+
+	var apps = $.NSApplication('sharedApplication')
+	function runLoop() {
+		var pool = $.NSAutoreleasePool('alloc')('init')
+		try {
+			apps(
+				'nextEventMatchingMask',
+				$.NSAnyEventMask.toString(),
+				'untilDate',
+				$.NSDate('distantFuture'),
+				'inMode',
+				$.NSDefaultRunLoopMode,
+				'dequeue',
+				1
+			)
+		} catch (e) {
+			console.error('run loop error', e.message)
+		}
+		pool('drain')
+		setTimeout(runLoop, 1000)
+		//process.nextTick(runLoop);
+	}
+
+	runLoop()
 }
-exports.system = system;
+exports.system = system

app/package.json

@@ -7,13 +7,13 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "construct": "cd view/make && node make --automatic && cd ../../",
-    "dev": "electron ./ --dev",
+    "dev": "npx electron ./ --dev",
     "dist": "build --linux snap",
     "watchview": "node view/make/make.js --automatic --watch",
     "build:js": "node build.js",
-    "build": "electron-builder",
+    "build": "npx electron-builder",
-    "build:all": "electron-builder --win --linux",
+    "build:all": "npx electron-builder --win --linux",
-    "build:win": "electron-builder --win"
+    "build:win": "npx electron-builder --win"
   },
   "keywords": [
     "mastodon",
@@ -52,14 +52,13 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.11.2",
     "electron-dl": "^1.14.0",
+    "electron-window-state": "^5.0.3",
     "jimp": "^0.9.1",
     "jquery": "^3.4.1",
     "jquery-ui-dist": "^1.12.1",
-    "materialize-css": "git://github.com/cutls/materialize",
     "json5": "^2.1.1",
     "lodash": "^4.17.15",
-    "sumchecker": "^3.0.0",
+    "materialize-css": "git://github.com/cutls/materialize",
-    "sweetalert2": "^9.5.3",
     "sumchecker": "^3.0.1",
     "sweetalert2": "^9.4.0",
     "vue": "^2.6.10"

app/view/make/acct.sample.html

@@ -1,178 +1,145 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="@@lang@@">
+	<head>
+		<title>Account Manager - TheDesk</title>
+		<meta content="width=device-width,initial-scale=1.0" name="viewport" />
+		<link
+			href="../../node_modules/materialize-css/dist/css/materialize.css"
+			type="text/css"
+			rel="stylesheet"
+		/>
+		<link href="../../css/themes.css" type="text/css" rel="stylesheet" />
+		<link href="../../css/master.css" type="text/css" rel="stylesheet" />
+		<link href="../../css/tl.css" rel="stylesheet" type="text/css" />
+		<link href="../../css/userdata.css" rel="stylesheet" type="text/css" />
+		<link
+			href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css"
+			type="text/css"
+			rel="stylesheet"
+		/>
+		<link href="../../css/acct.css" rel="stylesheet" type="text/css" />
+		<meta charset="utf-8" />
+		@@comment-start@@
+		<script type="text/javascript">
+			var _jipt = []
+			_jipt.push(['project', 'thedesk'])
+		</script>
+		<script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+		@@comment-end@@
+	</head>
 
-<head>
+	<body id="mainView">
-      <title>Account Manager - TheDesk</title>
+		<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
-      <meta content="width=device-width,initial-scale=1.0" name="viewport">
+		<script type="text/javascript" src="../../js/platform/first.js"></script>
-      <link href="../../node_modules/materialize-css/dist/css/materialize.css" type="text/css" rel="stylesheet">
+		<script
-      <link href="../../css/themes.css" type="text/css" rel="stylesheet">
+			type="text/javascript"
-      <link href="../../css/master.css" type="text/css" rel="stylesheet">
+			src="../../node_modules/materialize-css/dist/js/materialize.js"
-      <link href="../../css/tl.css" rel="stylesheet" type="text/css">
+		></script>
-      <link href="../../css/userdata.css" rel="stylesheet" type="text/css">
+		<script type="text/javascript" src="main.js"></script>
-      <link href="../../node_modules/@fortawesome/fontawesome-free/css/all.min.css" type="text/css" rel="stylesheet">
+		<script
-      <style>
+			type="text/javascript"
-            .acct {
+			src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"
-                  display: flex;
+		></script>
-                  justify-content: space-around;
+		<script>
-            }
+			var misskeytoken = false
-
+		</script>
-            .card {
+		<script type="text/javascript" src="../../js/common/time.js"></script>
-                  width: 400px;
+		<div class="hide-first">
-                  background-color: #9e9e9e;
+			<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"
-                  margin: 10px;
+				>@@back@@</a
-            }
+			><br />
-
+			<h5>@@list@@</h5>
-            body,
+			<div id="acct-list"></div>
-            html {
+			<div class="divider"></div>
-                  overflow-y: scroll;
+		</div>
-            }
+		<div>
-
+			<h5>@@add@@</h5>
-            #acct-list {
+			<br />
-                  display: flex;
+			<div id="add">
-                  flex-wrap: wrap;
+				<div class="row">
-                  color: white;
+					<div class="col s8">
-                  align-items: flex-start
+						<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
-            }
+						<div id="ins-suggest"></div>
-
+						@@codesetupwarn@@<br />
-            .lts {
+						<label>
-                  font-size: 150%
+							<input type="checkbox" class="filled-in" id="linux" />
-            }
+							<span>@@codesetup@@</span>
-
+						</label>
-            .colorsel {
+						<br />
-                  display: flex;
+						<label>
-            }
+							<input type="checkbox" class="filled-in" id="misskey" />
-
+							<span>@@thisismisskey@@</span> </label
-            .card .colorsel div:not(.exc) {
+						><br />
-                  width: 20px;
+						<button class="btn waves-effect" onclick="instance()">Login</button><br />
-                  height: 20px;
+					</div>
-            }
+					<div class="col s4">
-
+						<span style="font-family:Open Sans;">Supports</span>
-            .card .colorsel div.exc {
+						<div id="support" class="collection transparent"></div>
-                  width: 40px;
+					</div>
-                  height: 20px;
+				</div>
-            }
+			</div>
-
+			<div id="auth" style="display:none">
-            .first {
+				@@codepastewarn@@<br />
-                  display: flex;
+				<input type="text" id="code" placeholder="@@codepaste@@" required />
-                  justify-content: center;
+				<button class="btn waves-effect" onclick="code()">Auth</button><br />
-                  align-items: center
+				<br />
-            }
+				<a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
-
+				<div id="compt" style="display:none">
-            .first .hide-first {
+					<h5>ログイン前に必ずご確認ください</h5>
-                  display: none;
+					<span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span
-            }
+					>のため以下の機能がご利用いただけません。
-
+					<span id="compt-warn" style="display:none"
-            #compt {
+						>また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span
-                  margin-top: 20px;
+					>
-                  margin-bottom: 50px;
+					<ul id="compt-list"></ul>
-                  border: 1px solid;
+				</div>
-                  border: 1px solid;
+			</div>
-                  padding: 5px;
+			<div id="misskeylogin" style="display:none">
-            }
+				<h5>AppSecret</h5>
-
+				@@misskeylogin@@<br />
-            #compt li {
+				<input type="hidden" id="misskey-url" />
-                  list-style-type: disc;
+				<input type="text" id="misskey-key" placeholder="@@codepaste@@" required />
-                  margin-left: 20px;
+				<button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br />
-            }
+				<br />
-      </style>
+				<a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
-      <meta charset="utf-8">
+			</div>
-      @@comment-start@@
+		</div>
-      <script type="text/javascript">
+		<div class="hide-first">
-            var _jipt = [];
+			<h5>@@mainacct@@</h5>
-            _jipt.push(['project', 'thedesk']);
+			<div class="input-field" style="width:300px">
-      </script>
+				<span data-trans="your_acct">@@selacct@@</span>
-      <script type="text/javascript" src="https://cdn.crowdin.com/jipt/jipt.js"></script>
+				<br />
-      @@comment-end@@
+				<select
-</head>
+					id="main-acct-sel"
-
+					class="acct-sel"
-<body id="mainView">
+					style="color:black"
-      <script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
+					onchange="mainacct()"
-      <script type="text/javascript" src="../../js/platform/first.js"></script>
+				></select>
-      <script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
+				<label></label>
-      <script type="text/javascript" src="main.js"></script>
+			</div>
-      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
+			<ul id="domain-list" class="collection transparent"></ul>
-      <script>
+			<div id="instance-data">
-            var misskeytoken = false;
+				Some instance data by
-      </script>
+				<a href="https://instances.social" target="_blank">instances.social API</a><br />
-      <script type="text/javascript" src="../../js/common/time.js"></script>
+				<h5 id="ins-title"></h5>
-      <div class="hide-first">
+				Administered by:<a id="ins-admin"></a><br />
-            <a href="index.html" class="btn waves-effect orange nex"
+				<span id="ins-desc"></span><br />
-                  style="width:100%; max-width:200px;">@@back@@</a><br>
+				<img src="../../img/loading.svg" id="ins-prof" width="200" /><br />
-            <h5>@@list@@</h5>
+				<br />
-            <div id="acct-list"></div>
+				@@domain@@:<span id="ins-name"></span><br />
-            <div class="divider"></div>
+				@@connect@@:<span id="ins-connect"></span>@@ko@@<br />
-      </div>
+				@@toots@@:<span id="ins-toot"></span>@@ko@@<br />
-      <div>
+				@@users@@:<span id="ins-user"></span>@@users@@<br />
-            <h5>@@add@@</h5><br>
+				@@safety@@:<span id="ins-per"></span>%<br />
-            <div id="add">
+				@@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br />
-                  <div class="row">
+			</div>
-                        <div class="col s8">
+		</div>
-                              <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
+		<script type="text/javascript" src="../../js/ui/theme.js"></script>
-                              <div id="ins-suggest"></div>
+		<script type="text/javascript" src="../../js/platform/end.js"></script>
-                              @@codesetupwarn@@<br>
+		<script type="text/javascript" src="../../js/common/sha256.js"></script>
-                              <label>
+		<script type="text/javascript" src="../../node_modules/lodash/lodash.min.js"></script>
-                                    <input type="checkbox" class="filled-in" id="linux" />
+		<script type="text/javascript" src="../../js/login/instance.js"></script>
-                                    <span>@@codesetup@@</span>
+		<script type="text/javascript" src="../../js/login/manager.js"></script>
-                              </label>
+		<script type="text/javascript" src="../../js/tl/date.js"></script>
-                              <br>
+	</body>
-                              <label>
+</html>
-                                    <input type="checkbox" class="filled-in" id="misskey" />
-                                    <span>@@thisismisskey@@</span>
-                              </label><br>
-                              <button class="btn waves-effect" onclick="instance()">Login</button><br>
-                        </div>
-                        <div class="col s4">
-                              <span style="font-family:Open Sans;">Supports</span>
-                              <div id="support" class="collection transparent"></div>
-                        </div>
-                  </div>
-            </div>
-            <div id="auth" style="display:none">
-                  @@codepastewarn@@<br>
-                  <input type="text" id="code" placeholder="@@codepaste@@" required>
-                  <button class="btn waves-effect" onclick="code()">Auth</button><br>
-                  <br>
-                  <a onclick="atSetup()" class="pointer">@@accessTokenSetup@@</a>
-                  <div id="compt" style="display:none">
-                        <h5>ログイン前に必ずご確認ください</h5>
-                        <span id="compt-instance"></span>はバージョンが<span id="compt-ver"></span>のため以下の機能がご利用いただけません。
-                        <span id="compt-warn" style="display:none">また、このインスタンスはMastodonではなくそのAPI上の互換実装であり、TheDeskでは利用を想定していないため非保証となります。</span>
-                        <ul id="compt-list"></ul>
-                  </div>
-            </div>
-            <div id="misskeylogin" style="display:none">
-                  <h5>AppSecret</h5>
-                  @@misskeylogin@@<br>
-                  <input type="hidden" id="misskey-url">
-                  <input type="text" id="misskey-key" placeholder="@@codepaste@@" required>
-                  <button class="btn waves-effect" onclick="misskeyLogin()">Auth</button><br>
-                  <br>
-                  <a onclick="atSetup('misskey')" class="pointer">@@accessTokenSetup@@</a>
-            </div>
-      </div>
-      <div class="hide-first">
-            <h5>@@mainacct@@</h5>
-            <div class="input-field" style="width:300px"><span data-trans="your_acct">@@selacct@@</span>
-                  <br>
-                  <select id="main-acct-sel" class="acct-sel" style="color:black" onchange="mainacct()"></select>
-                  <label></label>
-            </div>
-            Some instance data by <a href="https://instances.social" target="_blank">instances.social API</a><br>
-            <h5 id="ins-title"></h5>
-            Administered by:<a id="ins-admin"></a><br>
-            <span id="ins-desc"></span><br>
-            <img src="../../img/loading.svg" id="ins-prof" width="200"><br>
-            <br>
-            @@domain@@:<span id="ins-name"></span><br>
-            @@connect@@:<span id="ins-connect"></span>@@ko@@<br>
-            @@toots@@:<span id="ins-toot"></span>@@ko@@<br>
-            @@users@@:<span id="ins-user"></span>@@users@@<br>
-            @@safety@@:<span id="ins-per"></span>%<br>
-            @@ver@@:<span id="ins-ver"></span>@<span id="ins-upd"></span><br>
-      </div>
-      <script type="text/javascript" src="../../js/ui/theme.js"></script>
-      <script type="text/javascript" src="../../js/platform/end.js"></script>
-      <script type="text/javascript" src="../../js/common/sha256.js"></script>
-      <script type="text/javascript" src="../../js/login/instance.js"></script>
-      <script type="text/javascript" src="../../js/login/manager.js"></script>
-      <script type="text/javascript" src="../../js/tl/date.js"></script>

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "None",
     "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.",
     "lang_manager_logout": "Logout",
+    "lang_manager_maxChars": "Max chars of toots",
     "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.",
     "lang_emoji_get": "Get emojis",
     "lang_emoji_custom": "Custom emojis",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "Continue on the new account",
     "lang_showontl_botacct": "[bot]",
     "lang_showontl_followed": "Following you",
+    "lang_parse_request": "Follow request",
     "lang_showontl_notf": "Notification ",
     "lang_showontl_domain": "Domain ",
     "lang_showontl_listwarn": "Follow to add this user to lists.",

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

@@ -48,6 +48,7 @@
     "lang_manager_none": "なし",
     "lang_manager_godev": "MisskeyのDevセンターに移動します。同時に開かれるドキュメントを参考にログインしてください。",
     "lang_manager_logout": "ログアウト",
+    "lang_manager_maxChars": "投稿最大文字数",
     "lang_bbmd_misskey": "TheDeskにおけるMisskeyでは、@を返信として扱いますが、全ての@は消去され別パラメータに入力されます。また、「未収載」を「ホーム」として扱います。",
     "lang_emoji_get": "絵文字リストを取得",
     "lang_emoji_custom": "カスタム絵文字",
@@ -154,6 +155,7 @@
     "lang_showontl_movebtn": "移行先を見る",
     "lang_showontl_botacct": "botアカウント",
     "lang_showontl_followed": "フォローされています",
+    "lang_parse_request": "フォローリクエスト",
     "lang_showontl_notf": "通知",
     "lang_showontl_domain": "ドメイン",
     "lang_showontl_listwarn": "リストに追加するためにはフォローが必要です。",

app/yarn.lock

@@ -1031,6 +1031,14 @@ electron-rebuild@^1.8.8:
     spawn-rx "^3.0.0"
     yargs "^13.2.4"
 
+electron-window-state@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-5.0.3.tgz#4f36d09e3f953d87aff103bf010f460056050aa8"
+  integrity sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg==
+  dependencies:
+    jsonfile "^4.0.0"
+    mkdirp "^0.5.1"
+
 electron@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/electron/-/electron-7.1.1.tgz#98be17d850e64689a09ab6dd1e437b36307f2fcf"