fix

Bumps [sweetalert2](https://github.com/sweetalert2/sweetalert2) from 9.4.0 to 9.5.3.
- [Release notes](https://github.com/sweetalert2/sweetalert2/releases)
- [Changelog](https://github.com/sweetalert2/sweetalert2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sweetalert2/sweetalert2/compare/v9.4.0...v9.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

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

@@ -224,7 +224,10 @@ iframe,
 	margin: -1px 0;
 }
 .bigemoji {
-	width: 60px !important;
+	width: 100px !important;
+	height: auto !important;
+	position: relative;
+	z-index: 9999;
 }
 .faicon_FTL {
 	display: none;
@@ -371,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;
 }
@@ -705,7 +733,8 @@ p:not(:last-child) {
 	position: relative;
 }
 .maxVoter {
-	background-color: var(--shared);
+	background-color: var(--emphasized);
+	filter: brightness(120%);
 }
 .ownMark img {
 	width: 1.2rem !important;
@@ -756,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}')">
-					<i class="material-icons">info</i>${lang.lang_manager_info}
-				</a>
-				<a class="waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
-					<i class="material-icons">refresh</i>${lang.lang_manager_refresh}
-				</a>
-				<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}
+				<button class="btn-flat waves-effect disTar pointer  white-text" onclick="refresh('${key}')">
+					<i class="material-icons left">refresh</i>${lang.lang_manager_refresh}
+				</button>
+				<button class="btn-flat waves-effect disTar pointer red-text" onclick="multiDel('${key}')">
+					<i class="material-icons left">delete</i>${lang.lang_manager_delete}
+				</button><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) {
-			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.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 json = await promise.json()
+	$('#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)
 	var start = 'https://' + domain + '/api/v1/instance'
-	fetch(start, {
+	let promise2 = await 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.error) {
-				$('#ins-title').text(json.title)
-				$('#ins-desc').html(json.description)
-				$('#ins-email').text(json.email)
-				$('#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)
-			}
-		})
+	var json = await promise2.json()
+	$('#ins-title').text(json.title)
+	$('#ins-desc').html(json.description)
+	$('#ins-email').text(json.email)
+	$('#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
+	)
+	if (json['max_toot_chars']) {
+		localStorage.setItem('letters_' + acct_id, json['max_toot_chars'])
+		load()
+	}
 }
 
 //アカウントデータ　消す

app/js/platform/end.js

@@ -138,13 +138,13 @@ onmessage = function(e) {
 	} else if (e.data[0] == 'udg') {
 		udg(e.data[1][0], e.data[1][1])
 	} else if (e.data[0] == 'media') {
-		media(e.data[1][0], e.data[1][1], e.data[1][2])
+		media(e.data[1][0], e.data[1][1], e.data[1][2], e.data[1][3])
 	} else if (e.data[0] == 'post') {
 		post('pass')
 	} else if (e.data[0] == 'toastSaved') {
 		var show = `${lang.lang_img_DLDone}${
 			e.data[1][0]
-		}<button class="btn-flat toast-action" onclick="openFinder(${e.data[1][1]}')">Show</button>`
+		}<button class="btn-flat toast-action" onclick="openFinder('${e.data[1][1]}')">Show</button>`
 		M.toast({ html: show, displayLength: 5000 })
 	} else if (e.data[0] == 'parseColumn') {
 		parseColumn(e.data[1])

app/js/platform/first.js

@@ -211,8 +211,23 @@ function escapeCsv(str) {
 	}
 	return result
 }
+function evalAttr(json, attr, lenCk) {
+	if (json[attr]) {
+		if (lenCk) {
+			if (json[attr][0]) {
+				return true
+			} else {
+				return false
+			}
+		} else {
+			return true
+		}
+	} else {
+		return false
+	}
+}
 function statusModel(now) {
-	if(!now){
+	if (!now) {
 		var now = new Date().toString()
 	}
 	return {
@@ -248,12 +263,10 @@ function statusModel(now) {
 			locked: false,
 			bot: false,
 			created_at: now,
-			note:
-				'',
+			note: '',
 			url: '',
 			avatar: '',
-			avatar_static:
-				'',
+			avatar_static: '',
 			header: '',
 			header_static: '',
 			followers_count: 0,

app/js/platform/preload.js

@@ -13,6 +13,10 @@ onmessage = function(e) {
 		ipc.send('dialogStore', e.data[1])
 	} else if (e.data[0] == 'bmpImage') {
 		ipc.send('bmp-image', e.data[1])
+	} else if (e.data[0] == 'resizeImage') {
+		ipc.send('resize-image', e.data[1])
+	} else if (e.data[0] == 'stampImage') {
+		ipc.send('stamp-image', e.data[1])
 	} else if (e.data[0] == 'dialogCW') {
 		ipc.send('dialogCW', e.data[1])
 	} else if (e.data[0] == 'nativeNotf') {
@@ -112,7 +116,31 @@ ipc.on('theme-css-response', function(event, arg) {
 })
 //img.js
 ipc.on('bmp-img-comp', function(event, b64) {
-	postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+	if (b64[2]) {
+		var stamped = true
+	} else {
+		var stamped = false
+	}
+	postMessage(['media', [b64[0], 'image/png', b64[1], stamped]], '*')
+})
+ipc.on('resizeJudgement', function(event, b64) {
+	var resize = localStorage.getItem('uploadCrop') * 1
+	if (resize > 0) {
+		var element = new Image()
+		var width
+		element.onload = function() {
+			var width = element.naturalWidth
+			var height = element.naturalHeight
+			if (width > resize || height > resize) {
+				ipc.send('resize-image', [b64, resize])
+			} else {
+				postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+			}
+		}
+		element.src = b64
+	} else {
+		postMessage(['media', [b64[0], 'image/png', b64[1]]], '*')
+	}
 })
 //ui,img.js
 ipc.on('general-dl-prog', function(event, arg) {

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

@@ -60,6 +60,24 @@ function handleFileUpload(files, obj, no) {
 	var fr = new FileReader()
 	fr.onload = function(evt) {
 		var b64 = evt.target.result
+		var resize = localStorage.getItem('uploadCrop') * 1
+		if (resize > 0) {
+			var element = new Image()
+			var width
+			element.onload = function() {
+				var width = element.naturalWidth
+				var height = element.naturalHeight
+				if (width > resize || height > resize) {
+					postMessage(['resizeImage', [b64, resize]], '*')
+					return false
+				} else {
+					$('#b64-box').val(b64)
+					var ret = media(b64, files['type'], no)
+				}
+			}
+			element.src = b64
+			return false
+		}
 		$('#b64-box').val(b64)
 		var ret = media(b64, files['type'], no)
 	}
@@ -68,7 +86,14 @@ function handleFileUpload(files, obj, no) {
 }
 
 //ファイルアップロード
-function media(b64, type, no) {
+function media(b64, type, no, stamped) {
+	var acct_id = $('#post-acct-sel').val()
+	var domain = localStorage.getItem('domain_' + acct_id)
+	var user = localStorage.getItem('user_' + acct_id)
+	if ($('#stamp').hasClass('stamp-avail') && !stamped) {
+		postMessage(['stampImage', [b64, user + '@' + domain]], '*')
+		return false
+	}
 	var l = 4
 	var c = 'abcdefghijklmnopqrstuvwxyz0123456789'
 	var cl = c.length
@@ -88,8 +113,6 @@ function media(b64, type, no) {
 	var media = toBlob(b64, type)
 	var fd = new FormData()
 	fd.append('file', media)
-	var acct_id = $('#post-acct-sel').val()
-	var domain = localStorage.getItem('domain_' + acct_id)
 	var at = localStorage.getItem('acct_' + acct_id + '_at')
 	var httpreq = new XMLHttpRequest()
 	if (localStorage.getItem('mode_' + domain) == 'misskey') {
@@ -104,7 +127,6 @@ function media(b64, type, no) {
 		}
 		var previewer = 'url'
 		fd.append('i', at)
-		//fd.append('isSensitive', nsfw);
 		httpreq.send(fd)
 	} else {
 		var previewer = 'preview_url'
@@ -133,11 +155,7 @@ function media(b64, type, no) {
 			}
 			var img = localStorage.getItem('img')
 			if (json.type.indexOf('image') != -1) {
-				var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${
-					json['id']
-				}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${
-					json['id']
-				}')" title="${lang.lang_postimg_delete}">`
+				var html = `<img src="${json[previewer]}" class="preview-img pointer" data-media="${json['id']}" oncontextmenu="deleteImage('${json['id']}')" onclick="altImage('${acct_id}','${json['id']}')" title="${lang.lang_postimg_delete}">`
 				$('#preview').append(html)
 			} else {
 				$('#preview').append(lang.lang_postimg_previewdis)
@@ -151,7 +169,7 @@ function media(b64, type, no) {
 				mediav = mediav.replace(regExp, json['id'])
 				$('#media').val(mediav)
 			}
-			if (img == 'url') {
+			if (img == 'url' && json['text_url']) {
 				$('#textarea').val($('#textarea').val() + ' ' + json['text_url'])
 			}
 			todc()
@@ -300,3 +318,12 @@ function altImage(acct_id, id) {
 		}
 	})
 }
+function stamp() {
+	if ($('#stamp').hasClass('stamp-avail')) {
+		$('#stamp').html('Off')
+		$('#stamp').removeClass('stamp-avail')
+	} else {
+		$('#stamp').html('On')
+		$('#stamp').addClass('stamp-avail')
+	}
+}

app/js/post/post.js

@@ -295,6 +295,8 @@ function clear() {
 	$('#nsfw').removeClass('yellow-text')
 	$('#nsfw').html('visibility_off')
 	$('#nsfw').removeClass('nsfw-avail')
+	$('#stamp').html('Off')
+	$('#stamp').removeClass('stamp-avail')
 	$('#nsc').text(lang.lang_nothing)
 	$('#drag').css('background-color', '#e0e0e0')
 	$('#preview').html('')

app/js/post/status.js

@@ -1,7 +1,7 @@
 //お気に入り登録やブースト等、フォローやブロック等
 //お気に入り登録
 function fav(id, acct_id, remote) {
-	if ($('#pub_' + id).hasClass('faved')) {
+	if ($(`.cvo[unique-id=${id}]`).hasClass('faved')) {
 		var flag = 'unfavourite'
 	} else {
 		var flag = 'favourite'
@@ -57,7 +57,7 @@ function fav(id, acct_id, remote) {
 
 //ブースト
 function rt(id, acct_id, remote, vis) {
-	if ($('#pub_' + id).hasClass('rted')) {
+	if ($(`.cvo[toot-id=${id}]`).hasClass('rted')) {
 		var flag = 'unreblog'
 	} else {
 		var flag = 'reblog'
@@ -85,7 +85,7 @@ function rt(id, acct_id, remote, vis) {
 				json = json.reblog
 			}
 			console.log(['Success: boost', json])
-			$('[unique-id=' + id + '] .fav_ct').text(json.favourites_count)
+			$('[toot-id=' + id + '] .fav_ct').text(json.favourites_count)
 			if (!json.reblog) {
 				if (flag == 'unreblog') {
 					var rt = json.reblogs_count - 1
@@ -95,16 +95,16 @@ function rt(id, acct_id, remote, vis) {
 				} else {
 					var rt = json.reblogs_count
 				}
-				$('[unique-id=' + id + '] .rt_ct').text(rt)
+				$('[toot-id=' + id + '] .rt_ct').text(rt)
 			} else {
-				$('[unique-id=' + id + '] .rt_ct').text(json.reblogs_count)
+				$('[toot-id=' + id + '] .rt_ct').text(json.reblogs_count)
 			}
 
-			if ($('[unique-id=' + id + ']').hasClass('rted')) {
-				$('[unique-id=' + id + ']').removeClass('rted')
+			if ($('[toot-id=' + id + ']').hasClass('rted')) {
+				$('[toot-id=' + id + ']').removeClass('rted')
 				$('.rt_' + id).removeClass('light-blue-text')
 			} else {
-				$('[unique-id=' + id + ']').addClass('rted')
+				$('[toot-id=' + id + ']').addClass('rted')
 				$('.rt_' + id).addClass('light-blue-text')
 			}
 		}
@@ -117,7 +117,7 @@ function boostWith(vis) {
 }
 //ブックマーク
 function bkm(id, acct_id, tlid) {
-	if ($('#pub_' + id).hasClass('bkmed')) {
+	if ($(`.cvo[unique-id=${id}]`).hasClass('bkmed')) {
 		var flag = 'unbookmark'
 	} else {
 		var flag = 'bookmark'
@@ -420,20 +420,30 @@ function redraft(id, acct_id) {
 					$('select').formSelect()
 					mdCheck()
 					var medias = $('[toot-id=' + id + ']').attr('data-medias')
+					var mediack = json.media_attachments[0]
+					//メディアがあれば
+					var media_ids = []
+					if (mediack) {
+						for (var i = 0; i <= 4; i++) {
+							if (json.media_attachments[i]) {
+								media_ids.push(json.media_attachments[i].id)
+								$('#preview').append(
+									'<img src="' +
+										json.media_attachments[i].preview_url +
+										'" style="width:50px; max-height:100px;">'
+								)
+							} else {
+								break
+							}
+						}
+					}
 					var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis')
 					vis(vismode)
+					var medias = media_ids.join(',');
 					$('#media').val(medias)
-					var ct = medias.split(',').length
-					$('[toot-id=' + id + '] img.toot-img').each(function(i, elem) {
-						if (i < ct) {
-							var url = $(elem).attr('src')
-							console.log('Play back image data:' + url)
-							$('#preview').append('<img src="' + url + '" style="width:50px; max-height:100px;">')
-						}
-					})
 					localStorage.setItem('nohide', true)
 					show()
-					if(json.text){
+					if (json.text) {
 						var html = json.text
 					} else {
 						var html = $('[toot-id=' + id + '] .toot').html()
@@ -449,12 +459,12 @@ function redraft(id, acct_id) {
 						cw()
 						$('#cw-text').val(json.spoiler_text)
 					}
-					if (json.sensitive){
+					if (json.sensitive) {
 						$('#nsfw').addClass('yellow-text')
 						$('#nsfw').html('visibility')
 						$('#nsfw').addClass('nsfw-avail')
 					}
-					if(json.in_reply_to_id){
+					if (json.in_reply_to_id) {
 						$('#reply').val(json.in_reply_to_id)
 					}
 				}
@@ -464,7 +474,7 @@ function redraft(id, acct_id) {
 }
 //ピン留め
 function pin(id, acct_id) {
-	if ($('#pub_' + id).hasClass('pined')) {
+	if ($(`.cvo[unique-id=${id}]`).hasClass('pined')) {
 		var flag = 'unpin'
 	} else {
 		var flag = 'pin'
@@ -644,13 +654,17 @@ function staEx(mode) {
 			console.error(error)
 		})
 		.then(function(json) {
-			var id = json.statuses[0].id
-			if (mode == 'rt') {
-				rt(id, acct_id, 'remote')
-			} else if (mode == 'fav') {
-				fav(id, acct_id, 'remote')
-			} else if (mode == 'reply') {
-				reEx(id)
+			if (json.statuses) {
+				if (json.statuses[0]) {
+					var id = json.statuses[0].id
+					if (mode == 'rt') {
+						rt(id, acct_id, 'remote')
+					} else if (mode == 'fav') {
+						fav(id, acct_id, 'remote')
+					} else if (mode == 'reply') {
+						reEx(id)
+					}
+				}
 			}
 		})
 	return

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

@@ -69,17 +69,20 @@ function notfColumn(acct_id, tlid, sys) {
 						var n = new Notification('TheDesk:' + domain, options)
 					}
 					var mute = getFilterTypeByAcct(acct_id, 'notif')
-					if (obj.type != 'follow') {
+					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
+					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)
 						} else {
-							templete = templete + userparse([obj.account], 'notf', acct_id, tlid, -1)
+							templete = templete + userparse([obj.account], obj.type, acct_id, tlid, -1)
 						}
 					}
 				})
@@ -179,7 +182,8 @@ function notfCommon(acct_id, tlid, sys) {
 						var n = new Notification('TheDesk:' + domain, options)
 					}
 					var mute = getFilterTypeByAcct(acct_id, 'notif')
-					if (obj.type != 'follow') {
+					//Pleromaにはmoveというtypeがあるらしい。何が互換APIじゃ
+					if (obj.type != 'follow' && obj.type != 'move') {
 						if (misskey) {
 							templete = templete + misskeyParse([obj], 'notf', acct_id, 'notf', -1, mute)
 						} else {
@@ -189,7 +193,7 @@ function notfCommon(acct_id, tlid, sys) {
 						if (misskey) {
 							templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
 						} else {
-							templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1)
+							templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
 						}
 					}
 				})
@@ -238,7 +242,7 @@ function notfWS(misskey, acct_id, tlid, domain, at) {
 					if (obj.type != 'follow') {
 						templete = parse([obj], 'notf', acct_id, 'notf', popup)
 					} else {
-						templete = userparse([obj], 'notf', acct_id, 'notf', popup)
+						templete = userparse([obj], obj.type, acct_id, 'notf', popup)
 					}
 					if (!$('div[data-notfIndv=' + acct_id + '_' + obj.id + ']').length) {
 						$('div[data-notf=' + acct_id + ']').prepend(templete)
@@ -338,7 +342,7 @@ function notfmore(tlid) {
 							if (misskey) {
 								templete = templete + misskeyUserparse([obj], 'notf', acct_id, 'notf', -1, mute)
 							} else {
-								templete = templete + userparse([obj.account], 'notf', acct_id, 'notf', -1)
+								templete = templete + userparse([obj.account], obj.type, acct_id, 'notf', -1)
 							}
 						}
 					})

app/js/tl/parse.js

@@ -217,8 +217,13 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			Object.keys(toot.account.emojis).forEach(function(key5) {
 				var emoji = toot.account.emojis[key5]
 				var shortcode = emoji.shortcode
+				if (gif == 'yes') {
+					var emoSource = emoji.url
+				} else {
+					var emoSource = emoji.static_url
+				}
 				var emoji_url = `
-					<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
+					<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
 						alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
 				`
 				var regExp = new RegExp(':' + shortcode + ':', 'g')
@@ -227,7 +232,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 		}
 		var noticeavatar = ''
 		if (mix == 'notf') {
-			if(!toot.status) {
+			if (!toot.status) {
 				toot.status = statusModel(toot.created_at)
 			}
 			if (gif == 'yes') {
@@ -367,9 +372,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				Object.keys(toot.account.emojis).forEach(function(key5) {
 					var emoji = toot.account.emojis[key5]
 					var shortcode = emoji.shortcode
+					if (gif == 'yes') {
+						var emoSource = emoji.url
+					} else {
+						var emoSource = emoji.static_url
+					}
 					var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+					`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					dis_name = dis_name.replace(regExp, emoji_url)
 				})
@@ -418,9 +429,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					Object.keys(toot.account.emojis).forEach(function(key5) {
 						var emoji = toot.account.emojis[key5]
 						var shortcode = emoji.shortcode
+						if (gif == 'yes') {
+							var emoSource = emoji.url
+						} else {
+							var emoSource = emoji.static_url
+						}
 						var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+						`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
 					})
@@ -571,7 +588,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			//Poll
 			var poll = ''
 			if (toot.poll) {
-				var poll = pollParse(toot.poll, acct_id)
+				var poll = pollParse(toot.poll, acct_id, false)
 			}
 
 			var mediack = toot.media_attachments[0]
@@ -831,9 +848,15 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 				Object.keys(toot.emojis).forEach(function(key5) {
 					var emoji = toot.emojis[key5]
 					var shortcode = emoji.shortcode
+					if (gif == 'yes') {
+						var emoSource = emoji.url
+					} else {
+						var emoSource = emoji.static_url
+					}
 					var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+						<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+					`
 					var regExp = new RegExp(':' + shortcode + ':', 'g')
 					content = content.replace(regExp, emoji_url)
 					spoil = spoil.replace(regExp, emoji_url)
@@ -1037,9 +1060,11 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</a>
 					</div>
 					<div class="action ${can_rt} ${disp['rt']} ${noauth}">
-						<a onclick="rt('${uniqueid}','${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_${uniqueid}"></i>
+							<i class="fas fa-retweet ${if_rt} rt_${toot.id}"></i>
 							<span class="rt_ct">${toot.reblogs_count}</span>
 						</a>
 					</div>
@@ -1085,28 +1110,26 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						<a onclick="client('${$.strip_tags(via)}')" class="pointer">${lang.lang_parse_clientop}</a>
 					</div>
 					<div>
-					<button onclick="bkm('${toot.id}','${acct_id}','${tlid}')"
+					<button onclick="bkm('${uniqueid}','${acct_id}','${tlid}')"
 						class="waves-effect waves-dark btn-flat actct bkm-btn" style="padding:0">
 						<i class="fas text-darken-3 fa-bookmark bkm_${toot.id} ${if_bkm}"></i>
-						<span class="bkmStr_${toot.id}">${bkmStr}</span>
+						<span class="bkmStr_${uniqueid}">${bkmStr}</span>
 					</button>
 					</div>
 					<div class="${if_mine}">
-						<button onclick="del('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+						<button onclick="del('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
 							<i class="fas fa-trash"></i>${lang.lang_parse_del}
 						</button>
 					</div>
 					<div class="${if_mine}">
-						<button onclick="pin('${
-							toot.id
-						}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
-							<i class="fas fa-map-pin pin_${toot.id} ${if_pin}"></i>
-							<span class="pinStr_${toot.id}">${pinStr}</span>
+						<button onclick="pin('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct" style="padding:0">
+							<i class="fas fa-map-pin pin_${uniqueid} ${if_pin}"></i>
+							<span class="pinStr_${uniqueid}">${pinStr}</span>
 						</button>
 					</div>
 					<div class="${if_mine}">
-						<button onclick="redraft('${toot.id}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
+						<button onclick="redraft('${uniqueid}','${acct_id}')" class="waves-effect waves-dark btn-flat actct"
 							style="padding:0">
 							<i class="material-icons">redo</i>${lang.lang_parse_redraft}
 						</button>
@@ -1138,6 +1161,10 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 	if (locale == 'yes') {
 		var locale = false
 	}
+	var gif = localStorage.getItem('gif')
+	if (!gif) {
+		gif = 'yes'
+	}
 	var templete = ''
 	var datetype = localStorage.getItem('datetype')
 	Object.keys(obj).forEach(function(key) {
@@ -1167,10 +1194,17 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 				} else {
 					var authhtml = ''
 				}
-				var ftxt = lang.lang_parse_followed
-				if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
-					ftxt = localStorage.getItem('followlocale_' + acct_id)
+				if (auth == 'follow') {
+					var ftxt = lang.lang_parse_followed
+					if (!locale && localStorage.getItem('followlocale_' + acct_id)) {
+						ftxt = localStorage.getItem('followlocale_' + acct_id)
+					}
+				} 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) {
 					var notftext = ftxt + '<br>'
 				} else {
@@ -1213,9 +1247,15 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					Object.keys(toot.emojis).forEach(function(key5) {
 						var emoji = toot.emojis[key5]
 						var shortcode = emoji.shortcode
+						if (gif == 'yes') {
+							var emoSource = emoji.url
+						} else {
+							var emoSource = emoji.static_url
+						}
 						var emoji_url = `
-						<img draggable="false" src="${emoji.url}" class="emoji-img" data-emoji="${shortcode}" 
-							alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle(\'bigemoji\');">`
+							<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+								alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+						`
 						var regExp = new RegExp(':' + shortcode + ':', 'g')
 						dis_name = dis_name.replace(regExp, emoji_url)
 					})
@@ -1224,7 +1264,11 @@ function userparse(obj, auth, acct_id, tlid, popup) {
 					dis_name = twemoji.parse(dis_name)
 				}
 				if (toot.avatar) {
-					var avatar = toot.avatar
+					if (gif == 'yes') {
+						var avatar = toot.avatar
+					} else {
+						var avatar = toot.avatar_static
+					}
 				} else {
 					var avatar = '../../img/missing.svg'
 				}
@@ -1241,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}
@@ -1261,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">
-						${toot.note.replace(/<br\s?\/?>.+/g, '<span class="gray">...</span>')}
-					</div>
-					<div style="justify-content:space-around;top:5px" class="area-actions">
+					<div class="area-status">
 						<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>
 				`
@@ -1347,7 +1390,7 @@ function client(name) {
 	}
 }
 //Poll Parser
-function pollParse(poll, acct_id) {
+function pollParse(poll, acct_id, emojis) {
 	var datetype = localStorage.getItem('datetype')
 	var anime = localStorage.getItem('animation')
 	if (anime == 'yes' || !anime) {
@@ -1355,6 +1398,10 @@ function pollParse(poll, acct_id) {
 	} else {
 		var lpAnime = ''
 	}
+	var gif = localStorage.getItem('gif')
+	if (!gif) {
+		gif = 'yes'
+	}
 	var choices = poll.options
 	if (poll.own_votes) {
 		var minechoice = poll.own_votes
@@ -1388,7 +1435,7 @@ function pollParse(poll, acct_id) {
 	}
 	var ended = date(poll.expires_at, datetype)
 	var pollHtml = ''
-	if (choices[0].votes_count === 0 || choices[0].votes_count >0) {
+	if (choices[0].votes_count === 0 || choices[0].votes_count > 0) {
 		var max = _.maxBy(choices, 'votes_count').votes_count
 	} else {
 		var max = 0
@@ -1400,7 +1447,8 @@ function pollParse(poll, acct_id) {
 		for (var i = 0; i < minechoice.length; i++) {
 			var me = minechoice[i]
 			if (me == keyc) {
-				var voteit = '<span class="ownMark"><img class="emoji" draggable="false" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/2705.png"></span>'
+				var voteit =
+					'<span class="ownMark"><img class="emoji" draggable="false" src="https://twemoji.maxcdn.com/v/12.1.4/72x72/2705.png"></span>'
 				break
 			}
 		}
@@ -1413,7 +1461,7 @@ function pollParse(poll, acct_id) {
 			var voteclass = ''
 		}
 		var per = Math.ceil((choice.votes_count / poll.votes_count) * 100)
-		if(!per) per = 0
+		if (!per) per = 0
 		if (max == choice.votes_count) {
 			var addPoll = 'maxVoter'
 		} else {
@@ -1425,11 +1473,31 @@ function pollParse(poll, acct_id) {
 		} else {
 			openData = `<span style="float: right">?<span class="sml">(-%)</span></span>`
 		}
+		var choiceText = escapeHTML(choice.title)
+		if (emojis) {
+			//絵文字があれば
+			Object.keys(emojis).forEach(function(key5) {
+				var emoji = emojis[key5]
+				var shortcode = emoji.shortcode
+				if (gif == 'yes') {
+					var emoSource = emoji.url
+				} else {
+					var emoSource = emoji.static_url
+				}
+				var emoji_url = `
+			<img draggable="false" src="${emoSource}" class="emoji-img" data-emoji="${shortcode}" 
+				alt=" :${shortcode}: " title="${shortcode}" onclick="this.classList.toggle('bigemoji');">
+		`
+				var regExp = new RegExp(':' + shortcode + ':', 'g')
+				choiceText = choiceText.replace(regExp, emoji_url)
+			})
+			choiceText = twemoji.parse(choiceText)
+		}
 		pollHtml =
 			pollHtml +
 			`<div class="${voteclass} vote vote_${acct_id}_${poll.id}_${keyc}" onclick="${votesel}">
 				<span class="vote_${acct_id}_${poll.id}_result leadPoll ${result_hide} ${addPoll} ${lpAnime}" style="width: ${per}%"></span>
-				<span class="onPoll">${escapeHTML(choice.title)}${voteit}</span>
+				<span class="onPoll">${choiceText}${voteit}</span>
 				<span class="vote_${acct_id}_${poll.id}_result ${result_hide} onPoll">
 					${openData}
 				</span>

app/js/tl/poll.js

@@ -120,7 +120,7 @@ function voteMastodonrefresh(acct_id, id) {
 			if (!json) {
 				return false
 			}
-			var poll = pollParse(json, acct_id)
+			var poll = pollParse(json, acct_id, json.emojis)
 			$('.vote_' + acct_id + '_' + json.id).html(poll)
 		}
 	}

app/js/ui/img.js

@@ -53,7 +53,7 @@ function imgCont(type) {
 	$('#imagemodal').attr('data-image', murl)
 	//表示はリモートを使うか(どちらにしろコピーはオリジナル)
 	var remote_img = localStorage.getItem('remote_img')
-	if (remote_img == 'yes') {
+	if (remote_img == 'yes' && ourl != 'null') {
 		murl = ourl
 	}
 	if (murl) {
@@ -95,7 +95,7 @@ function imageXhr(id, key, murl) {
 		'loadend',
 		function(event) {
 			var total = event.total
-			$('#imgbyte').text(Math.floor(total/1024))
+			$('#imgbyte').text(Math.floor(total / 1024))
 			var now = event.loaded
 			var per = (now / total) * 100
 			$('#imgprog').text(Math.floor(per))
@@ -266,9 +266,8 @@ function dlImg() {
 	if (remote_img == 'yes') {
 		murl = ourl
 	}
-	if (localStorage.getItem('savefolder')) {
-		var save = localStorage.getItem('savefolder')
-	} else {
+	var save = localStorage.getItem('savefolder')
+	if (!save || save == 'null') {
 		var save = ''
 	}
 	postMessage(['generalDL', [murl, save, false]], '*')

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";
-			localStorage.setItem("theme", "black");
+			var 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('greentheme');
-	el.classList.remove('browntheme');
-	el.classList.remove('blacktheme');
-	el.classList.remove('bluetheme');
-	el.classList.remove('customtheme');
-	el.classList.add(theme + "theme");
-	var font = localStorage.getItem("font");
+	el.classList.remove('indigotheme')
+	el.classList.remove('greentheme')
+	el.classList.remove('browntheme')
+	el.classList.remove('blacktheme')
+	el.classList.remove('bluetheme')
+	el.classList.remove('customtheme')
+	el.classList.add(theme + 'theme')
+	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 (localStorage.getItem("customtheme-id")) {
-			postMessage(["themeCSSRequest", localStorage.getItem("customtheme-id")], "*")
+	if (theme == 'custom') {
+		if (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) {
-		mainWindow.center()
-	}
+	window_size.manage(mainWindow)
 	// ウィンドウが閉じられたらアプリも終了
 	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/img.js

@@ -1,43 +1,92 @@
 function img(mainWindow, dir) {
-    const electron = require("electron");
-    const dialog = electron.dialog;
-    const fs = require("fs");
-    var Jimp = require("jimp");
-    var ipc = electron.ipcMain;
-    const BrowserWindow = electron.BrowserWindow;
-    ipc.on('file-select', (e, args) => {
-
-        dialog.showOpenDialog(null, {
-            properties: ['openFile', 'multiSelections'],
-            title: '添付ファイルを選択',
-            defaultPath: '.',
-            filters: [
-                { name: 'メディアファイル', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm'] },
-                { name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
-                { name: '動画', extensions: ['mp4', 'webm'] },
-                { name: '全てのファイル', extensions: ['*'] }
-            ]
-        }, (fileNames) => {
-            if (!fileNames) {
-                return false;
-            }
-            for (var i = 0; i < fileNames.length; i++) {
-                var path = fileNames[i];
-                var bin = fs.readFileSync(path, 'base64');
-                e.sender.webContents.send('bmp-img-comp', [bin, 'new']);
-            }
-        });
-    });
-    ipc.on('bmp-image', (e, args) => {
-
-        var m = args[0].match(/(.+)\\(.+)\.(.+)$/);
-        Jimp.read(args[0], function (err, lenna) {
-            if (err) throw err;
-            lenna.getBase64(Jimp.MIME_PNG, function (err, src) {
-                e.sender.webContents.send('bmp-img-comp', [src, args[1]]);
-            });
-        });
-
-    });
+	const electron = require('electron')
+	const dialog = electron.dialog
+	const fs = require('fs')
+	var Jimp = require('jimp')
+	var ipc = electron.ipcMain
+	const BrowserWindow = electron.BrowserWindow
+	ipc.on('file-select', (e, args) => {
+		dialog.showOpenDialog(
+			null,
+			{
+				properties: ['openFile', 'multiSelections'],
+				title: '添付ファイルを選択',
+				defaultPath: '.',
+				filters: [
+					{
+						name: 'メディアファイル',
+						extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg', 'mp4', 'webm']
+					},
+					{ name: '画像', extensions: ['jpg', 'png', 'gif', 'bmp', 'jpeg'] },
+					{ name: '動画', extensions: ['mp4', 'webm'] },
+					{ name: '全てのファイル', extensions: ['*'] }
+				]
+			},
+			fileNames => {
+				if (!fileNames) {
+					return false
+				}
+				for (var i = 0; i < fileNames.length; i++) {
+					var path = fileNames[i]
+					var bin = fs.readFileSync(path, 'base64')
+					e.sender.webContents.send('resizeJudgement', [bin, 'new'])
+				}
+			}
+		)
+	})
+	ipc.on('bmp-image', (e, args) => {
+		Jimp.read(args[0], function(err, lenna) {
+			if (err) throw err
+			lenna.getBase64(Jimp.MIME_PNG, function(err, src) {
+				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
+			})
+		})
+	})
+	ipc.on('resize-image', (e, args) => {
+		var ext = args[0].toString().slice(args[0].indexOf('/') + 1, args[0].indexOf(';'))
+		if (ext == 'jpeg') {
+			var use = 'MIME_JPEG'
+		} else {
+			var use = 'MIME_PNG'
+		}
+		var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
+		var decodedFile = new Buffer(b64, 'base64')
+		Jimp.read(decodedFile, function(err, lenna) {
+			if (err) throw err
+			lenna.scaleToFit(args[1], args[1]).getBase64(Jimp[use], function(err, src) {
+				e.sender.webContents.send('bmp-img-comp', [src, args[1]])
+			})
+		})
+	})
+	ipc.on('stamp-image', (e, args) => {
+		var text = args[1]
+		var b64 = args[0].replace(/^data:\w+\/\w+;base64,/, '')
+		var decodedFile = new Buffer(b64, 'base64')
+		console.log(text)
+		Jimp.read(decodedFile, function(err, image) {
+			if (err) throw err
+			Jimp.loadFont(Jimp.FONT_SANS_16_BLACK).then(font => {
+				var evWidth = Jimp.measureText(font, text)
+				var width = image.bitmap.width
+				var height = image.bitmap.height
+				var left = width - evWidth - 10
+				var top = height - 30
+                var color = Jimp.intToRGBA(image.getPixelColor(left, top))
+                console.log(left, top, color)
+				var ave = (color.r + color.g + color.b) / 3
+				if (ave > 128) {
+					image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
+						e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
+					})
+				} else {
+					Jimp.loadFont(Jimp.FONT_SANS_16_WHITE).then(font => {
+						image.print(font, left, top, args[1]).getBase64(Jimp.MIME_PNG, function(err, src) {
+							e.sender.webContents.send('bmp-img-comp', [src, args[1], true])
+						})
+					})
+				}
+			})
+		})
+	})
 }
-exports.img = img;
+exports.img = img

app/main/system.js

@@ -1,300 +1,365 @@
 function system(mainWindow, dir, lang, dirname) {
-	const electron = require("electron");
-	const app = electron.app;
-	const join = require("path").join;
-	var Jimp = require("jimp");
-	const fs = require("fs");
-	var JSON5 = require("json5");
-	var ipc = electron.ipcMain;
-	const clipboard = electron.clipboard;
-	var tmp_img = join(app.getPath("userData"), "tmp.png");
-	var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
-	var ua_path = join(app.getPath("userData"), "useragent");
-	var lang_path = join(app.getPath("userData"), "language");
-	var log_dir_path = join(app.getPath("userData"), "logs");
+	const electron = require('electron')
+	const app = electron.app
+	const join = require('path').join
+	var Jimp = require('jimp')
+	const fs = require('fs')
+	var JSON5 = require('json5')
+	var ipc = electron.ipcMain
+	const clipboard = electron.clipboard
+	var tmp_img = join(app.getPath('userData'), 'tmp.png')
+	var ha_path = join(app.getPath('userData'), 'hardwareAcceleration')
+	var ua_path = join(app.getPath('userData'), 'useragent')
+	var lang_path = join(app.getPath('userData'), 'language')
+	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);
-	var yestStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	today.setDate(today.getDate() - 1)
+	var yestStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 	//一昨日のやつ
-	today.setDate(today.getDate() - 1);
-	var yest2Str = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate() + ".log";
+	today.setDate(today.getDate() - 1)
+	var yest2Str = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate() + '.log'
 
-	const BrowserWindow = electron.BrowserWindow;
-	const dialog = electron.dialog;
-	const os = require("os");
-	const language = require("../main/language.js");
+	const BrowserWindow = electron.BrowserWindow
+	const dialog = electron.dialog
+	const os = require('os')
+	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) {
-		console.log("set:" + arg);
-		fs.writeFileSync(lang_path, arg);
-		e.sender.webContents.send("langres", arg);
-	});
+	ipc.on('lang', function(e, arg) {
+		console.log('set:' + arg)
+		fs.writeFileSync(lang_path, arg)
+		e.sender.webContents.send('langres', arg)
+	})
 	//エクスポートのダイアログ
-	ipc.on("exportSettings", function(e, args) {
+	ipc.on('exportSettings', function(e, args) {
 		dialog.showSaveDialog(
-			null,
+			mainWindow,
 			{
-				title: "Export",
-				properties: ["openFile", "createDirectory"],
-				defaultPath: "export.thedeskconfig.json5"
+				title: 'Export',
+				properties: ['openFile', 'createDirectory'],
+				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(
-			null,
+			mainWindow,
 			{
-				title: "Import",
-				properties: ["openFile"],
-				filters: [{ name: "TheDesk Config", extensions: ["thedeskconfig", "thedeskconfigv2", "json5"] }]
+				title: 'Import',
+				properties: ['openFile'],
+				filters: [
+					{ name: 'TheDesk Config', extensions: ['thedeskconfig', 'thedeskconfigv2', 'json5'] }
+				]
 			},
 			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(
-			null,
+			mainWindow,
 			{
-				title: "Save folder",
-				properties: ["openDirectory"]
+				title: 'Save folder',
+				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(
-			null,
+			mainWindow,
 			{
-				title: "Custom sound",
-				properties: ["openFile"],
-				filters: [{ name: "Audio", extensions: ["mp3", "aac", "wav", "flac", "m4a"] }, { name: "All", extensions: ["*"] }]
+				title: 'Custom sound',
+				properties: ['openFile'],
+				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) {
-		if (arg == "true") {
-			fs.writeFileSync(ha_path, arg);
+	ipc.on('ha', function(e, arg) {
+		if (arg == 'true') {
+			fs.writeFileSync(ha_path, arg)
 		} else {
-			fs.unlink(ha_path, function(err) {});
+			fs.unlink(ha_path, function(err) {})
 		}
-		app.relaunch();
-		app.exit();
-	});
-	ipc.on("ua", function(e, arg) {
-		if (arg == "") {
-			fs.unlink(ua_path, function(err) {});
+		app.relaunch()
+		app.exit()
+	})
+	ipc.on('ua', function(e, arg) {
+		if (arg == '') {
+			fs.unlink(ua_path, function(err) {})
 		} else {
-			fs.writeFileSync(ua_path, arg);
+			fs.writeFileSync(ua_path, arg)
 		}
-		app.relaunch();
-		app.exit();
-	});
+		app.relaunch()
+		app.exit()
+	})
 
-	ipc.on("quit", (e, args) => {
-		app.quit();
-	});
-	ipc.on("about", (e, args) => {
-		about();
-	});
+	ipc.on('quit', (e, args) => {
+		app.quit()
+	})
+	ipc.on('about', (e, args) => {
+		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);
-		return "true";
+		})
+		window.loadURL(dir + '/about.html?ver=' + ver)
+		return 'true'
 	}
-	ipc.on("nano", function(e, x, y) {
-		var nano_info_path = join(app.getPath("userData"), "nano-window-position.json");
-		var window_pos;
+	ipc.on('nano', function(e, x, y) {
+		var nano_info_path = join(app.getPath('userData'), 'nano-window-position.json')
+		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.setAlwaysOnTop(true);
+		})
+		nanowindow.loadURL(dir + '/nano.html')
+		nanowindow.setAlwaysOnTop(true)
 		//nanowindow.toggleDevTools()
-		nanowindow.setPosition(window_pos[0], window_pos[1]);
-		nanowindow.on("close", function() {
-			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()));
-		});
-		return true;
-	});
-	var cbTimer1;
-	ipc.on("startmem", (e, arg) => {
-		event = e.sender;
-		cbTimer1 = setInterval(mems, 1000);
-	});
+		nanowindow.setPosition(window_pos[0], window_pos[1])
+		nanowindow.on('close', function() {
+			fs.writeFileSync(nano_info_path, JSON.stringify(nanowindow.getPosition()))
+		})
+		return true
+	})
+	var cbTimer1
+	ipc.on('startmem', (e, arg) => {
+		event = e.sender
+		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) => {
-		fs.writeFileSync(args[0], JSON5.stringify(args[1]));
-		e.sender.webContents.send("exportAllComplete", "");
-	});
+	ipc.on('export', (e, args) => {
+		fs.writeFileSync(args[0], JSON5.stringify(args[1]))
+		e.sender.webContents.send('exportAllComplete', '')
+	})
 	//フォント
 	function object_array_sort(data, key, order, fn) {
 		//デフォは降順(DESC)
-		var num_a = -1;
-		var num_b = 1;
+		var num_a = -1
+		var num_b = 1
 
-		if (order === "asc") {
+		if (order === 'asc') {
 			//指定があれば昇順(ASC)
-			num_a = 1;
-			num_b = -1;
+			num_a = 1
+			num_b = -1
 		}
 
 		data = data.sort(function(a, b) {
-			var x = a[key];
-			var y = b[key];
-			if (x > y) return num_a;
-			if (x < y) return num_b;
-			return 0;
-		});
+			var x = a[key]
+			var y = b[key]
+			if (x > y) return num_a
+			if (x < y) return num_b
+			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) => {
-		const fm = require("font-manager");
-		var fonts = fm.getAvailableFontsSync();
-		object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
-			e.sender.webContents.send("font-list", fonts_sorted);
-		});
-	});
+	ipc.on('fonts', (e, arg) => {
+		const fm = require('font-manager')
+		var fonts = fm.getAvailableFontsSync()
+		object_array_sort(fonts, 'family', 'asc', function(fonts_sorted) {
+			e.sender.webContents.send('font-list', fonts_sorted)
+		})
+	})
 	//コピー
-	ipc.on("copy", (e, arg) => {
-		clipboard.writeText(arg);
-	});
+	ipc.on('copy', (e, arg) => {
+		clipboard.writeText(arg)
+	})
 	//ログ
-	ipc.on("log", (e, arg) => {
-		var today = new Date();
-		var todayStr = today.getFullYear() + "" + (today.getMonth() + 1) + "" + today.getDate();
-		var log_path = join(log_dir_path, todayStr + ".log");
-		fs.appendFile(log_path, "\n" + arg, function(err) {
+	ipc.on('log', (e, arg) => {
+		var today = new Date()
+		var todayStr = today.getFullYear() + '' + (today.getMonth() + 1) + '' + today.getDate()
+		var log_path = join(log_dir_path, todayStr + '.log')
+		fs.appendFile(log_path, '\n' + arg, function(err) {
 			if (err) {
-				throw err;
+				throw err
 			}
-		});
-	});
-	ipc.on("getLogs", (e, arg) => {
-		var logs=""
-		var todayLog=""
-		var yestLog=""
-		var yest2Log=""
+		})
+	})
+	ipc.on('getLogs', (e, arg) => {
+		var logs = ''
+		var todayLog = ''
+		var yestLog = ''
+		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 = yest2Log + yestLog + todayLog;
-			e.sender.webContents.send("logData", logs);
-		});
-	});
+				logs = todayLog + yestLog + yest2Log
+			})
+			logs = yest2Log + yestLog + todayLog
+			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") {
-				fs.mkdirSync(log_dir_path);
+			if (error.code === 'ENOENT') {
+				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

@@ -1,19 +1,19 @@
 {
   "name": "thedesk",
-  "version": "20.0.6",
+  "version": "20.1.0",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "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:all": "electron-builder --win --linux",
-    "build:win": "electron-builder --win"
+    "build": "npx electron-builder",
+    "build:all": "npx electron-builder --win --linux",
+    "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",
-    "sweetalert2": "^9.4.0",
+    "materialize-css": "git://github.com/cutls/materialize",
     "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>
-      <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">
-      <style>
-            .acct {
-                  display: flex;
-                  justify-content: space-around;
-            }
-
-            .card {
-                  width: 400px;
-                  background-color: #9e9e9e;
-                  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;
-            }
-      </style>
-      <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>
-
-<body id="mainView">
-      <script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
-      <script type="text/javascript" src="../../js/platform/first.js"></script>
-      <script type="text/javascript" src="../../node_modules/materialize-css/dist/js/materialize.js"></script>
-      <script type="text/javascript" src="main.js"></script>
-      <script type="text/javascript" src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"></script>
-      <script>
-            var misskeytoken = false;
-      </script>
-      <script type="text/javascript" src="../../js/common/time.js"></script>
-      <div class="hide-first">
-            <a href="index.html" class="btn waves-effect orange nex"
-                  style="width:100%; max-width:200px;">@@back@@</a><br>
-            <h5>@@list@@</h5>
-            <div id="acct-list"></div>
-            <div class="divider"></div>
-      </div>
-      <div>
-            <h5>@@add@@</h5><br>
-            <div id="add">
-                  <div class="row">
-                        <div class="col s8">
-                              <input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp">
-                              <div id="ins-suggest"></div>
-                              @@codesetupwarn@@<br>
-                              <label>
-                                    <input type="checkbox" class="filled-in" id="linux" />
-                                    <span>@@codesetup@@</span>
-                              </label>
-                              <br>
-                              <label>
-                                    <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>
+	<body id="mainView">
+		<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
+		<script type="text/javascript" src="../../js/platform/first.js"></script>
+		<script
+			type="text/javascript"
+			src="../../node_modules/materialize-css/dist/js/materialize.js"
+		></script>
+		<script type="text/javascript" src="main.js"></script>
+		<script
+			type="text/javascript"
+			src="../../node_modules/sweetalert2/dist/sweetalert2.all.min.js"
+		></script>
+		<script>
+			var misskeytoken = false
+		</script>
+		<script type="text/javascript" src="../../js/common/time.js"></script>
+		<div class="hide-first">
+			<a href="index.html" class="btn waves-effect orange nex" style="width:100%; max-width:200px;"
+				>@@back@@</a
+			><br />
+			<h5>@@list@@</h5>
+			<div id="acct-list"></div>
+			<div class="divider"></div>
+		</div>
+		<div>
+			<h5>@@add@@</h5>
+			<br />
+			<div id="add">
+				<div class="row">
+					<div class="col s8">
+						<input type="text" id="url" style="width:70%" placeholder="ex)mstdn.jp" />
+						<div id="ins-suggest"></div>
+						@@codesetupwarn@@<br />
+						<label>
+							<input type="checkbox" class="filled-in" id="linux" />
+							<span>@@codesetup@@</span>
+						</label>
+						<br />
+						<label>
+							<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>
+			<ul id="domain-list" class="collection transparent"></ul>
+			<div id="instance-data">
+				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>
+		</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="../../node_modules/lodash/lodash.min.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>
+	</body>
+</html>

app/view/make/index.sample.html

@@ -205,9 +205,11 @@
 					<div class="col s12 mize" style="margin-bottom:5px; padding:0;">
 						<div id="taglist"></div>
 						<div id="preview" class="mize"></div>
-						<span class=" sml mize"><span data-trans="reply">@@replyMode@@</span>:
-							<span id="rec">@@no@@</span>/<span data-trans="file">@@temp@@</span>:
-							<span id="mec">@@nothing@@</span>/@@poll@@:<span id="pollsta">@@no@@</span>
+						<span class=" sml mize"><span>@@replyMode@@</span>:
+							<span id="rec">@@no@@</span>/<span>@@temp@@</span>:
+							<span id="mec">@@nothing@@</span>
+								<a onclick="stamp()" class="pointer" title="@@stampWarn@@">@@stamp@@: <span id="stamp">Off</span></a>
+							/@@poll@@:<span id="pollsta">@@no@@</span>
 							<span id="vis" class="hide">public</span>
 						</span>
 						<br>
@@ -762,19 +764,57 @@
 			<a href="https://thedesk.top" target="_blank">HP</a><br>
 			<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br>
 			<br>
-			<div id="release-20-0-6_Kawaii" class="release-do" style="display:none; ">><br>
+			<div id="release-20-1-0_Kawaii" class="release-do" style="display:none; ">><br>
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv FanboxやPatreonでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note 20.0.6 (Kawaii)</h5>
-				・支援ダイアログが消えない
+				<h5>Release Note 20.1.0 (Kawaii)</h5>
+				・画像のページ送りに失敗する
 				<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>
-				・ステータスが虚無なことがある
+				・Pleromaのmove通知タイプの対応
 				<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>
+				・保存先フォルダが表示されないバグの修正
+				<a onclick="udgEx('micchan83@fedibird.com','main')" class="contributor">
+					<img src="https://user-images.githubusercontent.com/17561618/67261210-a46a7980-f4da-11e9-9c9c-704757d3b1a7.png">micchan83
+				</a>
+				<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('kPherox@pl.kpherox.dev','main')" class="contributor">
+					<img src="https://user-images.githubusercontent.com/17561618/66582379-a3714800-ebbc-11e9-8402-d81a35a3be9f.png">kPherox
+				</a>
+				<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>
+				・画像の長辺リサイズ(デフォルトはオフ) 
+				<a onclick="udgEx('popn_ja@popon.pptdn.jp','main')" class="contributor">
+					<img src="https://avatars3.githubusercontent.com/u/24523508?s=88&v=4">kaias1jp
+				</a>
+				<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>
+				・画像に自分のアカウント名(acct@aaa.tld)を入れるボタン(アップロード前に押す)
+				<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>
 			</div>
 			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>
@@ -1132,11 +1172,11 @@
 	<div id="support-btm" class="z-depth-4 hide">
 		<div id="support-btm-ja">
 			<h5>ご支援いただけませんか？</h5>
-			(これは支援の有無に関わらず定期的に出ます。)<br>
+			(これは支援の有無に関わらず定期的に出ます。過去のバージョン等で何度も表示される等のバグを確認しております。)<br>
 			あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。<br>
 			乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。<br>
-			ご安心ください。インターネット上のフリー百科事典のような高圧的支援要求はいたしません。コーヒーも要求いたしません。<br>
-			(中略)<br>
+			<br>
+			TheDeskになぜ金銭が発生するかについて: 詳細は省きますが、開発者から緊急の連絡をしたりするのに使われます。<br>
 			<b>全てのユーザーが安心してTheDeskを使っていただける環境のため</b>にも、ぜひご支援をご検討ください。ご支援いただけなくても使用不可能になることは全くありません。<br>
 			<b>@@TheDeskDes@@</b>
 		</div>

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

@@ -20,6 +20,8 @@
     "yes":"Yes",
     "temp":"Attaching files",
     "nothing":"None",
+    "stamp": "Stamp",
+    "stampWarn": "Your acct(aa@bb.cc) is printed on the right-bottom of the uploaded image",
     "vis":"Adjust status privacy",
     "cwtext":"Warning text",
     "selectVis":"Adjust status privacy",

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.",
@@ -193,6 +195,7 @@
     "lang_parse_detail": "Details",
     "lang_parse_redraft": "Delete & re-draft",
     "lang_parse_followed": "Followed you",
+    "lang_parse_moved": "Moved to...",
     "lang_parse_clientop": "Operation of this client",
     "lang_parse_clienttxt": " will be",
     "lang_parse_clientno": "done nothing",

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

@@ -10,6 +10,7 @@
   "env": "System Preferences",
   "setlang": "Languages",
   "backup": "Import and export of preferences",
+  "backupWarn": "If you got a error when you choose the file, please paste the strings of file and click import",
   "import": "Import",
   "export": "Export",
   "hardwareAcceleration": "Disable hardware acceleration",
@@ -137,6 +138,8 @@
   "nothing": "Hidden",
   "localonly": "Local Only",
   "zeroWidthEmoji": "Zero-width space when inserting emojis",
+  "uploadCrop": "Auto scale to fit",
+  "uploadCropWarn": "Max long-side px. Uploaded images are converted to JPEG(from JPEG) or PNG(from others). Set 0 and the images will not be resized. Pay attention to GIF animation.",
   "keysc": "Keyboard shortcut Preferences",
   "iks": "Easy inserter",
   "okswarn": "You can insert any letters and emojis with only 3 keys",

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

@@ -193,6 +193,7 @@
     "lang_parse_det": "詳細(メインアカウント経由)",
     "lang_parse_redraft": "このトゥートを削除して再編集",
     "lang_parse_followed": "フォローしてもろた。",
+    "lang_parse_moved": "他のサーバー行ったで",
     "lang_parse_clientop": "クライアント操作",
     "lang_parse_clienttxt": " どうする？",
     "lang_parse_clientno": "何もせえへん",

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

@@ -136,6 +136,8 @@
   "nothing": "表示しない",
   "localonly": "ローカル限定",
   "zeroWidthEmoji": "絵文字にゼロ幅スペースを使う",
+  "uploadCrop": "添付画像の自動リサイズ",
+  "uploadCropWarn": "最大の長辺ピクセル指定。JPEG以外は勝手にPNGイメージに変換するで。GIFアニメに注意しいや。0に設定するとリサイズせんで。",
   "keysc": "キーボードショートカットの設定",
   "iks": "簡単文字入力",
   "okswarn": "絵文字やタグ、>BTなどを登録しておくとすぐに使えてええ感じや。",

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

@@ -20,6 +20,8 @@
     "yes":"はい",
     "temp":"添付ファイル",
     "nothing":"なし",
+    "stamp": "スタンプ",
+    "stampWarn": "画像右下にアカウント名(aa@bb.cc)テキストを挿入します",
     "vis":"公開範囲",
     "cwtext":"警告文",
     "selectVis":"公開範囲指定",

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": "リストに追加するためにはフォローが必要です。",
@@ -193,6 +195,7 @@
     "lang_parse_det": "詳細(メインアカウント経由)",
     "lang_parse_redraft": "削除して再編集",
     "lang_parse_followed": "フォローされました。",
+    "lang_parse_moved": "引っ越ししました。",
     "lang_parse_clientop": "クライアント操作",
     "lang_parse_clienttxt": " に対する処理を選択してください。",
     "lang_parse_clientno": "何もしない",

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

@@ -10,6 +10,7 @@
   "env": "環境設定",
   "setlang": "言語",
   "backup": "設定のインポートとエクスポート",
+  "backupWarn": "インポートできない場合、ここにバックアップデータの中身をコピーしてください。",
   "import": "インポート",
   "export": "エクスポート",
   "hardwareAcceleration": "ハードウェアアクセラレーションの無効化",
@@ -137,6 +138,8 @@
   "nothing": "表示しない",
   "localonly": "ローカル限定",
   "zeroWidthEmoji": "絵文字にゼロ幅スペースを使う",
+  "uploadCrop": "添付画像の自動リサイズ",
+  "uploadCropWarn": "最大の長辺ピクセル指定。JPEG以外は自動でPNGイメージに変換されます。大きなGIFアニメは静止画になります。0に設定するとリサイズしません。",
   "keysc": "キーボードショートカットの設定",
   "iks": "簡単文字入力",
   "okswarn": "絵文字やタグ、>BTなどを登録しておくとすぐに入力できます。",

app/view/make/make.js

@@ -1,4 +1,4 @@
-let ver = '20.0.6 (Kawaii)'
+let ver = '20.1.0 (Kawaii)'
 if (process.argv.indexOf('--automatic') === -1) {
 	let input = require('readline-sync').question('version string [empty: ' + ver + ' (default)]? ')
 	if (input) {

app/view/make/setting.sample.html

@@ -52,7 +52,9 @@
 				<button onclick="exportSettings()" class="btn waves-effect lime darken-3"
 					style="width:100%; max-width:200px;">@@export@@</button>
 				<button onclick="importSettings()" class="btn waves-effect cyan darken-3"
-					style="width:100%; max-width:200px;">@@import@@</button>
+					style="width:100%; max-width:200px;">@@import@@</button><br>
+					@@backupWarn@@<br>
+					<input type="text" id="imp-exp" style="width: 300px">
 				<div id="envView">
 					<template v-for="(item, i) in config">
 						<h5>{{item.text.head}}</h5>

app/view/make/setting.sample.js

@@ -658,5 +658,17 @@ var postConstruction = [
 			desc: '',
 			checkbox: yesno
 		}
+	},{
+		id: 'uploadCrop',
+		storage: 'uploadCrop',
+		checkbox: false,
+		doubleText: false,
+		width: 100,
+		setValue: '0',
+		text: {
+			head: '@@uploadCrop@@',
+			desc: '@@uploadCropWarn@@',
+			after: 'px'
+		}
 	}
 ]

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"
@@ -2713,9 +2721,9 @@ supports-color@^5.3.0:
     has-flag "^3.0.0"
 
 sweetalert2@^9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.4.0.tgz#7dc06b09b830e201b5a51a2c84e52af3b8f396be"
-  integrity sha512-c9Azg2eVXIgaYV9Su2tRbRip7YD3baGwl9S7yKVdELu9E7rEcER+WBeJenVjR6kRGC426ggMFUgLTf0l/LUb1Q==
+  version "9.5.3"
+  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.5.3.tgz#b280e218dc387a96fa2b6175b50d75421a708f7d"
+  integrity sha512-4wzLUCmVby3NPQC8XHp0HRJgTm5tbAO7OOaqabATNe0U6JN/oyBTS7iJJG9V83MpcP6MLDUEWcGO/Y8i6g2jYw==
 
 tar@^4.4.12:
   version "4.4.13"