Merge branch 'master' into dependabot/npm_and_yarn/app/sweetalert2-9.10.9

app/js/post/secure.js

@@ -96,9 +96,9 @@ function cw() {
 	}
 }
 //TLでコンテントワーニングを表示トグル
-function cw_show(id) {
+function cw_show(e) {
-	$('.cw_hide_' + id).toggleClass('cw')
+	$(e).parent().parent().find('.cw_hide').toggleClass('cw')
-	$('.cw-long-' + id).toggleClass('hide')
+	$(e).parent().find('.cw_long').toggleClass('hide')
 }
 $(function() {
 	$('#cw-text').on('change', function(event) {

app/js/tl/misskeyparse.js

@@ -360,22 +360,20 @@ function misskeyParse(obj, mix, acct_id, tlid, popup, mutefilter) {
 		if ((toot.cw || toot.cw == "") && cw) {
 			var content = escapeHTML(toot.text);
 			var spoil = escapeHTMLtemp(toot.cw);
-			var spoiler = "cw cw_hide_" + toot.id;
+			var spoiler = "cw cw_hide";
 			var api_spoil = "gray";
-			var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+			var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
-				'\')" class="nex parsed cw_btn">' + lang.lang_parse_cwshow + '</a><br>';
 		} else {
 			var ct1 = nl2br(toot.text).split('<br />').length - 2;
 			var ct2 = nl2br(toot.text).split('<br>').length - 2;
 			if (ct1 > ct2) { var ct = ct1; } else { var ct = ct2; }
 			if ((sent < ct && $.mb_strlen($.strip_tagstemp(toot.text)) > 5) || ($.strip_tagstemp(toot.text).length > ltr && $.mb_strlen($.strip_tagstemp(toot.text)) > 5)) {
 				var content = '<span class="gray">' + lang.lang_parse_fulltext + '</span><br>' + escapeHTMLtemp(toot.text)
-				var spoil = '<span class="cw-long-' + toot.id + '">' + $.mb_substr($.strip_tagstemp(
+				var spoil = '<span class="cw_long">' + $.mb_substr($.strip_tagstemp(
 					toot.text), 0, 100) +
 					'</span><span class="gray">' + lang.lang_parse_autofold + '</span>';
-				var spoiler = "cw cw_hide_" + toot.id;
+				var spoiler = "cw cw_hide";
-				var spoiler_show = '<a href="#" onclick="cw_show(\'' + toot.id +
+				var spoiler_show = '<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
-					'\')" class="nex parsed cw_btn">' + lang.lang_parse_more + '</a><br>';
 			} else {
 				var content = escapeHTMLtemp(toot.text);
 				if (toot.cw) {

app/js/tl/parse.js

@@ -516,9 +516,9 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 			}
 			if (toot.spoiler_text && cw) {
 				var spoil = escapeHTML(toot.spoiler_text)
-				var spoiler = 'cw cw_hide_' + toot.id
+				var spoiler = 'cw cw_hide'
 				var api_spoil = 'gray'
-				var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
+				var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">${lang.lang_parse_cwshow}</a><br>`
 			} else {
 				if (content) {
 					var ct1 = content.split('</p>').length + content.split('<br />').length - 2
@@ -538,14 +538,14 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 					($.mb_strlen($.strip_tags(content)) > ltr && $.mb_strlen($.strip_tags(content)) > 5)
 				) {
 					var content = `<span class="gray">${lang.lang_parse_fulltext}</span><br>` + content
-					var spoil = `<span class="cw-long-${toot.id}">${$.mb_substr(
+					var spoil = `<span class="cw_long">${$.mb_substr(
 						$.strip_tags(content),
 						0,
 						100
 					)}</span>
 						<span class="gray">${lang.lang_parse_autofold}</span>`
-					var spoiler = 'cw cw_hide_' + toot.id
+					var spoiler = 'cw cw_hide'
-					var spoiler_show = `<a href="#" onclick="cw_show('${toot.id}')" class="nex parsed cw_btn">
+					var spoiler_show = `<a href="#" onclick="cw_show(this)" class="nex parsed cw_btn">
 							${lang.lang_parse_more}
 						</a><br>`
 				} else {

app/js/ui/settings.js

@@ -507,11 +507,11 @@ function fontList(arg) {
 		var font = arg[i]
 		$('#fonts').append(
 			'<div class="font pointer" style="font-family:' +
-				font.family +
+				font +
 				'" onclick="insertFont(\'' +
-				font.family +
+				font +
 				'\')">' +
-				font.family +
+				font +
 				'</div>'
 		)
 	}

app/js/ui/spotify.js

@@ -53,6 +53,16 @@ function spotifyFlagSave() {
 		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
 	}
 }
+function aMusicFlagSave() {
+	var awk = $("[name=amw]:checked").val();
+	if (awk == "yes") {
+		localStorage.setItem("complete-artwork", "yes");
+		M.toast({ html: lang.lang_spotify_img, displayLength: 3000 });
+	} else {
+		localStorage.removeItem("complete-artwork");
+		M.toast({ html: lang.lang_spotify_imgno, displayLength: 3000 });
+	}
+}
 function nowplaying(mode) {
 	if (mode == "spotify") {
 		var start = "https://thedesk.top/now-playing?at=" + localStorage.getItem("spotify") + "&rt=" + localStorage.getItem("spotify-refresh");
@@ -124,7 +134,7 @@ function nowplaying(mode) {
 		postMessage(["itunes", ""], "*");
 	}
 }
-function npCore(arg) {
+async function npCore(arg) {
 	console.table(arg);
 	var content = localStorage.getItem("np-temp");
 	if (!content || content == "" || content == "null") {
@@ -139,6 +149,9 @@ function npCore(arg) {
 	} else if (platform == "darwin") {
 		if (flag && arg.artwork) {
 			media(arg.artwork, "image/png", "new");
+		} else if (flag && localStorage.getItem('complete-artwork')) {
+			var q = arg.artist + ' ' + arg.album.name + ' ' + arg.name
+			postMessage(["bmpImage", [await getUnknownAA(q), 0]], "*");
 		}
 	}
 	var regExp = new RegExp("{song}", "g");
@@ -183,3 +196,15 @@ if (location.search) {
 	} else {
 	}
 }
+async function getUnknownAA(q) {
+	const start = 'https://itunes.apple.com/search?term=' + q + '&country=JP&entity=song'
+	let promise = await fetch(start, {
+		method: 'GET'
+	})
+	const json = await promise.json()
+	if(!json.resultCount) {
+		return []
+	}
+	const data = json.results
+	return data[0].artworkUrl100
+}

app/main.js

@@ -102,8 +102,10 @@ try {
 	var frameRaw = fs.readFileSync(frame_path, 'utf8')
 	if(frameRaw == 'false') {
 		var frame = false
+		var frameTitle = 'hidden'
 	} else {
 		var frame = true
+		var frameTitle = 'default'
 	}
 } catch {
 	var frame = true
@@ -186,6 +188,7 @@ function createWindow() {
 			y: window_size.y,
 			simpleFullscreen: true,
 			show: false,
+			titleBarStyle: frameTitle,
 			frame: frame,
 		}
 	}

app/main/dl.js

@@ -34,11 +34,12 @@ function dl(mainWindow, lang_path, base, dirname) {
 		}
 	})
 	//アプデDL
-	ipc.on('download-btn', (e, args) => {
+	ipc.on('download-btn', async (e, args) => {
 		function dl(url, file, dir, e) {
 			e.sender.webContents.send('mess', 'ダウンロードを開始します。')
 			const opts = {
 				directory: dir,
+				filename: file,
 				openFolderWhenDone: true,
 				onProgress: function(event) {
 					e.sender.webContents.send('prog', event)
@@ -54,29 +55,27 @@ function dl(mainWindow, lang_path, base, dirname) {
 		}
 		var platform = process.platform
 		var bit = process.arch
-		dialog.showSaveDialog(
+		var options = {
-			null,
+			title: 'Save',
-			{
+			defaultPath: app.getPath('home') + '/' + args[1]
-				title: 'Save',
+		}
-				defaultPath: app.getPath('home') + '/' + args[1]
+		const file = await dialog.showSaveDialog(null, options)
-			},
+		const savedFiles = file.filePath
-			savedFiles => {
+		console.log(savedFiles)
-				console.log(savedFiles)
+		if (!savedFiles) {
-				if (!savedFiles) {
+			return false
-					return false
+		}
-				}
+		if (platform == 'win32') {
-				if (platform == 'win32') {
+			var m = savedFiles.match(/(.+)\\(.+)$/)
-					var m = savedFiles.match(/(.+)\\(.+)$/)
+		} else {
-				} else {
+			var m = savedFiles.match(/(.+)\/(.+)$/)
-					var m = savedFiles.match(/(.+)\/(.+)$/)
+		}
-				}
+		//console.log(m);
-				//console.log(m);
+		if (isExistFile(savedFiles)) {
-				if (isExistFile(savedFiles)) {
+			fs.unlinkSync(savedFiles)
-					fs.unlinkSync(savedFiles)
+		}
-				}
+		console.log(m)
-				dl(args[0], args[1], m[1], e)
+		dl(args[0], m[2], m[1], e)
-			}
-		)
 	})
 
 	function isExistFile(file) {

app/main/system.js

@@ -242,11 +242,10 @@ function system(mainWindow, dir, lang, dirname) {
 		fn(data); // ソート後の配列を返す
 	}
 	ipc.on("fonts", (e, arg) => {
-		const fm = require("font-manager");
+		var SystemFonts = require('system-font-families').default;
-		var fonts = fm.getAvailableFontsSync();
+		var fm = new SystemFonts();
-		object_array_sort(fonts, "family", "asc", function(fonts_sorted) {
+		const fontList = fm.getFontsSync();
-			e.sender.webContents.send("font-list", fonts_sorted);
+		e.sender.webContents.send("font-list", fontList);
-		});
 	});
 	//コピー
 	ipc.on("copy", (e, arg) => {

app/package.json

@@ -54,18 +54,18 @@
     "@fortawesome/fontawesome-free": "^5.12.1",
     "custom-electron-titlebar": "^3.2.2-hotfix62",
     "electron-dl": "^3.0.0",
-    "jimp": "^0.9.6",
+    "jimp": "^0.10.1",
     "jquery": "^3.4.1",
     "jquery-ui-dist": "^1.12.1",
-    "json5": "^2.1.2",
+    "json5": "^2.1.3",
     "lodash": "^4.17.15",
     "materialize-css": "git://github.com/cutls/materialize#v1-dev",
     "sumchecker": "^3.0.1",
     "sweetalert2": "^9.10.9",
+    "system-font-families": "^0.4.1",
     "vue": "^2.6.11"
   },
   "optionalDependencies": {
-    "font-manager": "0.3.0",
     "itunes-nowplaying-mac": "0.3.1"
   },
   "devDependencies": {

app/view/make/language/af-ZA/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/ar-SA/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/bg-BG/setting.json

@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "абсолютна стойност",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/ca-ES/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/cs-CZ/setting.json

@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolutní hodnota",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/da-DK/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/de-DE/setting.json

@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "Absoluter Wert",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/el-GR/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

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

@@ -38,6 +38,7 @@
   "useragentWarn": "crwdns4374:0crwdne4374:0",
   "frame": "crwdns4462:0crwdne4462:0",
   "frameWarn": "crwdns4464:0crwdne4464:0",
+  "downloadWin": "crwdns4470:0crwdne4470:0",
   "absolute": "crwdns3972:0crwdne3972:0",
   "srcUrl": "crwdns4455:0crwdne4455:0",
   "srcUrlWarn": "crwdns4457:0{q}crwdne4457:0",

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

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn":"Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",
@@ -172,6 +173,8 @@
   "template2": "macOS:{song}:Song name/{album}:Album name/{artist}:Artist name/composer:{composer}/spampling rate:{hz}/bit rate:{bitRate}/genre:{genre}",
   "template3": "",
   "postartwork": "Attach an Artwork of Spotify",
+  "searchArtwork": "If the song has no artwork, automatic complete it(macOS)",
+  "searchArtworkWarn": "If you nowplaying an non-artwork song, get one which seems nice through API. If you do not like the completed artwork, you can right-click it to delete.",
   "tts": "TTS(text to speech) Preferences",
   "bouyomi": "BouyomiChan connect",
   "bouyomiWarn": "Require: BouyomiChan WebSocket Plugin",

app/view/make/language/es-AR/setting.json

@@ -38,6 +38,7 @@
   "useragentWarn": "Reiniciar cuando se cambie",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "valor absoluto",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/es-ES/setting.json

@@ -38,6 +38,7 @@
   "useragentWarn": "Reiniciar al cambiar",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "valor absoluto",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/fi-FI/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/fr-FR/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Thèmes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/he-IL/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/hu-HU/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/it-IT/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

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

@@ -37,6 +37,7 @@
   "useragentWarn":"再起動すんで。",
   "frame": "ウィンドウのフレーム",
   "frameWarn": "フレーム無しやとタイトルバーがシュッとするで。再起動すんで。",
+  "downloadWin": "バージョニングする(Windowsのダウンローダ)",
   "absolute": "絶対指定",
   "srcUrl": "検索エンジン",
   "srcUrlWarn": "{q}が検索文字列になるで。",
@@ -170,6 +171,8 @@
   "template2": "macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}",
   "template3": "",
   "postartwork": "アルバムアートワークを付ける(Spotify)",
+  "searchArtwork": "アルバムアートワークが無い時補完する(macOS)",
+  "searchArtworkWarn": "アルバムアートワークが見つからん時には、APIを使うて適切やと推定されるアートワークをつけとくで。気に入らない場合はアップロード完了後にアルバムアートワークを副ボタンのクリック(右クリック)をしたら消せるで。",
   "tts": "読み上げの設定",
   "bouyomi": "棒読みちゃん連携",
   "bouyomiWarn": "「棒読みちゃん用のWebSocket受付プラグイン」が要るで。",

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

@@ -38,6 +38,7 @@
   "useragentWarn":"再起動します。",
   "frame": "ウィンドウのフレーム",
   "frameWarn": "フレーム無しだと、タイトルバーのデザインがクールになります。再起動します。",
+  "downloadWin": "バージョニングする(Windowsのダウンローダ)",
   "absolute": "絶対指定",
   "srcUrl": "検索エンジン",
   "srcUrlWarn": "{q}が検索文字列に置換されます。",
@@ -171,7 +172,9 @@
   "template1": "Spotify:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/{url}:各曲のSpotifyのURL",
   "template2": "macOS:{song}:曲名/{album}:アルバム名/{artist}:アーティスト名/作曲家{composer}/サンプルレート{hz}/ビットレート{bitRate}/ジャンル{genre}",
   "template3": "",
-  "postartwork": "アルバムアートワークを添付する(Spotify)",
+  "postartwork": "アルバムアートワークを添付する",
+  "searchArtwork": "アルバムアートワークが無い時補完する(macOS)",
+  "searchArtworkWarn": "アルバムアートワークが無い場合、APIを使用して適切だと推定されるアートワークを添付します。気に入らない場合はアップロード完了後にアルバムアートワークを副ボタンのクリック(右クリック)をして削除してください。",
   "tts": "読み上げの設定",
   "bouyomi": "棒読みちゃん連携",
   "bouyomiWarn": "「棒読みちゃん用のWebSocket受付プラグイン」が必要です。",

app/view/make/language/nl-NL/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/no-NO/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Slå av maskinvareakselerasjon",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Temaer",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/pl-PL/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/pt-BR/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/pt-PT/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/ro-RO/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/ru-RU/setting.json

@@ -38,6 +38,7 @@
   "useragentWarn": "Перезапустить, когда изменилось",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "абсолютное значение",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/sr-SP/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/sv-SE/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/tr-TR/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/uk-UA/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/vi-VN/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/zh-CN/setting.json

@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/language/zh-TW/setting.json

@@ -18,7 +18,7 @@
   "hardwareAcceleration": "Disable hardware acceleration",
   "hardwareAccelerationWarn": "Auto restarted",
   "theme": "Themes",
-  "popup": "Popup notification(on Windows)",
+  "popup": "Popup notification",
   "popupwarn": "Hide to set \"0\"",
   "s": "sec",
   "nativenotf": "Native notification",
@@ -38,6 +38,7 @@
   "useragentWarn": "Restart when changed",
   "frame": "Window frame",
   "frameWarn": "If 'off', the window looks cool.",
+  "downloadWin": "Versioning(o Windows downloader)",
   "absolute": "absolute value",
   "srcUrl": "Search engine",
   "srcUrlWarn": "{q} will be replaced to query.",

app/view/make/setting.sample.html

@@ -417,7 +417,18 @@
 						value="no" />
 					<span>@@no@@</span>
 				</label>
-
+				<h5>@@searchArtwork@@</h5>
+				@@searchArtworkWarn@@<br />
+				<label>
+					<input class="with-gap" onchange="aMusicFlagSave()" name="amw" type="radio" id="amw_yes"
+						value="yes" />
+					<span>@@yes@@</span>
+				</label>
+				<label>
+					<input class="with-gap" onchange="aMusicFlagSave()" name="amw" type="radio" id="amw_no"
+						value="no" />
+					<span>@@no@@</span>
+				</label>
 				<br>
 			</div>
 		</li>

app/view/make/setting.sample.js

@@ -162,6 +162,16 @@ var envConstruction = [
 				}
 			]
 		}
+	},{
+		id: 'download',
+		storage: 'dl-win',
+		checkbox: true,
+		setValue: 'no',
+		text: {
+			head: '@@downloadWin@@',
+			desc: 'ex: TheDesk-1.0.0-setup.exe',
+			checkbox: yesno
+		}
 	}
 ]
 var tlConstruction = [

app/view/make/update.sample.html

@@ -166,22 +166,42 @@
 						if (sel == "install") {
 							if (bit == "x64") {
 								var url = json["winx64"];
-								var file = "TheDesk-setup.exe";
+								if(localStorage.getItem("dl-win") == "yes") {
+									var file = "TheDesk-" + json.unique + "-setup.exe";
+								} else {
+									var file = "TheDesk-setup.exe";
+								}
 							} else if (bit == "ia32") {
 								var url = json["winia32"];
-								var file = "TheDesk-setup-ia32.exe";
+								if(localStorage.getItem("dl-win") == "yes") {
+									var file = "TheDesk-" + json.unique + "-setup-ia32.exe";
+								} else {
+									var file = "TheDesk-setup-ia32.exe";
+								}
 							}
 						} else if (sel == "portable") {
 							if (bit == "x64") {
 								var url = json["winx64p"];
-								var file = "TheDesk.exe";
+								if(localStorage.getItem("dl-win") == "yes") {
+									var file = "TheDesk-" + json.unique + ".exe";
+								} else {
+									var file = "TheDesk.exe";
+								}
 							} else if (bit == "ia32") {
 								var url = json["winia32p"];
-								var file = "TheDesk-ia32.exe";
+								if(localStorage.getItem("dl-win") == "yes") {
+									var file = "TheDesk-" + json.unique + "-ia32.exe";
+								} else {
+									var file = "TheDesk-ia32.exe";
+								}
 							}
 						} else if (sel == "linux") {
 							var url = json["linuxx64"];
-							var file = "thedesk.zip";
+							if(localStorage.getItem("dl-win") == "yes") {
+								var file = "thedesk-" + json.unique_linux + ".zip";
+							} else {
+								var file = "thedesk.zip";
+							}
 						} else if (sel == "linuxdeb") {
 							var url = json["linuxdeb"];
 							var file = "thedesk_" + json.unique_linux + "_amd64.deb";
@@ -199,9 +219,8 @@
 				postMessage(["sendSinmpleIpc", "quit"], "*");
 			}
 			function updateProg(arg) {
-				console.log(arg);
+				$(".determinate").css("width", arg.percent * 100 + "%");
-				$(".determinate").css("width", arg * 100 + "%");
+				$("#prog").text(Math.floor(arg.percent * 100) + "%");
-				$("#prog").text(Math.floor(arg * 100) + "%");
 			}
 			function updateMess(arg) {
 				console.log(arg);

app/yarn.lock

@@ -42,23 +42,23 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.12.1.tgz#2a98fea9fbb8a606ddc79a4680034e9d5591c550"
   integrity sha512-ZtjIIFplxncqxvogq148C3hBLQE+W3iJ8E4UvJ09zIJUgzwLcROsWwFDErVSXY2Plzao5J9KUYNHKHMEUYDMKw==
 
-"@jimp/bmp@^0.9.6":
+"@jimp/bmp@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.9.6.tgz#379e261615d7c1f3b52af4d5a0f324666de53d7d"
+  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.10.1.tgz#e42889f98b1a1ed1fedd1d5cbeaec6ce6a618a56"
-  integrity sha512-T2Fh/k/eN6cDyOx0KQ4y56FMLo8+mKNhBh7GXMQXLK2NNZ0ckpFo3VHDBZ3HnaFeVTZXF/atLiR9CfnXH+rLxA==
+  integrity sha512-gy4ftMCgBZOx1e/Q+MaJlmU4qgqVqwGdf7G6byYTLEMUzzGK2Ipxf3nlXfkMOZqw7Bhc17zDnBIKluo7k0kX5Q==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     bmp-js "^0.1.0"
     core-js "^3.4.1"
 
-"@jimp/core@^0.9.6":
+"@jimp/core@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.9.6.tgz#a553f801bd436526d36e8982b99e58e8afc3d17a"
+  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.10.1.tgz#9c7cee4a1a151786a53d6c5defb141f640396cf9"
-  integrity sha512-sQO04S+HZNid68a9ehb4BC2lmW6iZ5JgU9tC+thC2Lhix+N/XKDJcBJ6HevbLgeTzuIAw24C5EKuUeO3C+rE5w==
+  integrity sha512-ChyLkGb1+x2mRpsdcnQuRNb523qVqUc7+zCbuO/VAMaqvbMKuRalVz3aHXcVwNi8vOAOgce4LOBT7kjdKTtR/w==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     any-base "^1.1.0"
     buffer "^5.2.0"
     core-js "^3.4.1"
@@ -70,256 +70,297 @@
     pixelmatch "^4.0.2"
     tinycolor2 "^1.4.1"
 
-"@jimp/custom@^0.9.6":
+"@jimp/custom@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.9.6.tgz#3d8a19d6ed717f0f1aa3f1b8f42fa374f43bc715"
+  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.10.1.tgz#1147f895272351adc3fd8192b73a2d4ccf563535"
-  integrity sha512-ZYKgrBZVoQwvIGlQSO7MFmn7Jn8a9X5g1g+KOTDO9Q0s4vnxdPTtr/qUjG9QYX6zW/6AK4LaIsDinDrrKDnOag==
+  integrity sha512-hiiOL5sGcV1p8hCFTabALUOmXs4VP9VwhfBZtsFueKGbwWz6dmaZvkMBsk3Mz1ukBP3xb09goWG+zAIdTm88fw==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/core" "^0.9.6"
+    "@jimp/core" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/gif@^0.9.6":
+"@jimp/gif@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.9.6.tgz#0a7b1e521daca635b02259f941bdb3600569d8e6"
+  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.10.1.tgz#fc238448cd8e367f9d73ed98347b083f0e71a184"
-  integrity sha512-Z2muC2On8KHEVrWKCCM0L2eua9kw4bQETzT7gmVsizc8MXAKdS8AyVV9T3ZrImiI0o5UkAN/u0cPi1U2pSiD8Q==
+  integrity sha512-xJwZ6JI6+GmrgTw///YdV8GY1z2dp4AAxEdm/KPozTvS2rygC8OZJcTmlswFws0UCH43rKzJlQUXa4Jb3ybB6w==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
     omggif "^1.0.9"
 
-"@jimp/jpeg@^0.9.6":
+"@jimp/jpeg@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.9.6.tgz#fb90bdc0111966987c5ba59cdca7040be86ead41"
+  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.10.1.tgz#93708ce2981772dd510670b78eacf703bb66a9f4"
-  integrity sha512-igSe0pIX3le/CKdvqW4vLXMxoFjTLjEaW6ZHt/h63OegaEa61TzJ2OM7j7DxrEHcMCMlkhUc9Bapk57MAefCTQ==
+  integrity sha512-PXxrBWZNNGpm7PRpdi2jt9fpTpQwe2Gf4juwuHXP/dBFHLk3wiI/npKkVITplwzzoQ6D4N0cb279c9bOpuQeJQ==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
     jpeg-js "^0.3.4"
 
-"@jimp/plugin-blit@^0.9.6":
+"@jimp/plugin-blit@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.9.6.tgz#7937e02e3514b95dbe4c70d444054847f6e9ce3c"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.10.1.tgz#fcd2d031294faf6f932e96f151df4c82e2b90f89"
-  integrity sha512-zp7X6uDU1lCu44RaSY88aAvsSKbgqUrfDyWRX1wsamJvvZpRnp1WekWlGyydRtnlUBAGIpiHCHmyh/TJ2I4RWA==
+  integrity sha512-53647EfRvPQJKQCMBc5AJGSZHyl6eueaOQq7PrfxEEq9Q3IjVcikAWYrZ4bHSZY7J12IIuz/5bSLJJZfegNQtA==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-blur@^0.9.6":
+"@jimp/plugin-blur@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.9.6.tgz#3d74b18c27e9eae11b956ffe26290ece6d250813"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.10.1.tgz#2f9f6e494183a4044cffb1883bbdff42aee914ea"
-  integrity sha512-xEi63hvzewUp7kzw+PI3f9CIrgZbphLI4TDDHWNYuS70RvhTuplbR6RMHD/zFhosrANCkJGr5OZJlrJnsCg6ug==
+  integrity sha512-0PzdzPGuv8RlhiMbLcM0tIekkHhuaPTY+frEWmO8BuCeqW9Tg9W4RxdwZtMqIVRG+kZBgyltYee31Q4JWlu9Hg==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-color@^0.9.6":
+"@jimp/plugin-circle@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.9.6.tgz#d0fca0ed4c2c48fd6f929ef4a03cebf9c1342e14"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.10.1.tgz#73184655fa0de586efbbda9675b3233fcd621a0a"
-  integrity sha512-o1HSoqBVUUAsWbqSXnpiHU0atKWy/Q1GUbZ3F5GWt/0OSDyl9RWM82V9axT2vePZHInKjIaimhnx1gGj8bfxkQ==
+  integrity sha512-sqiiEddN81N9xHZbPVjaJlbpQabaCeNGLW/x+0BfuNxnMPq7OkOx8IRpqIDYiGuuPhiR5hWxmmpws8ZAhjwsVw==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
+    core-js "^3.4.1"
+
+"@jimp/plugin-color@^0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.10.1.tgz#1b80654cbf4cd0bf6663b5ca94aa7317b8827e3d"
+  integrity sha512-SmW2+hFtNmQ33WYVsgKvreS8peCc5qItAvqGR58lKNoIMEZSNpyGwIu9g83HtDIImGsXpz3DWGMR1h8sLYCFcQ==
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
     tinycolor2 "^1.4.1"
 
-"@jimp/plugin-contain@^0.9.6":
+"@jimp/plugin-contain@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.9.6.tgz#7d7bbd5e9c2fa4391a3d63620e13a28f51e1e7e8"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.10.1.tgz#ca998fff6622e64f9ff9a5e6e5685fa3730fc8d1"
-  integrity sha512-Xz467EN1I104yranET4ff1ViVKMtwKLg1uRe8j3b5VOrjtiXpDbjirNZjP3HTlv8IEUreWNz4BK7ZtfHSptufA==
+  integrity sha512-1PkmUPd5iAicAI7QjO9r1Mp/Ia7ElJPwXTCNLsQkDxYS/L4u7vQ0xCkQkokAeR49Ul3GTWLqj9paWr7VSBG9Fg==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-cover@^0.9.6":
+"@jimp/plugin-cover@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.9.6.tgz#2853de7f8302f655ae8e95f51ab25a0ed77e3756"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.10.1.tgz#12de082cec1de678623880ac3f82bcf89efea7cd"
-  integrity sha512-Ocr27AvtvH4ZT/9EWZgT3+HQV9fG5njwh2CYMHbdpx09O62Asj6pZ4QI0kKzOcux1oLgv59l7a93pEfMOfkfwQ==
+  integrity sha512-fCiz+ugrRwffNixUHFxtRKhTYm8sFAoYbNNzV0WdiG8dS0qhoYjbOJPtLcIw9CyJbMZ5eXjGOTxhTAGzBng9DA==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-crop@^0.9.6":
+"@jimp/plugin-crop@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.9.6.tgz#82e539af2a2417783abbd143124a57672ff4cc31"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.10.1.tgz#40f20d8adcf83a7dd49ce40468afe82df72e16c4"
-  integrity sha512-d9rNdmz3+eYLbSKcTyyp+b8Nmhf6HySnimDXlTej4UP6LDtkq2VAyVaJ12fz9x6dfd8qcXOBXMozSfNCcgpXYA==
+  integrity sha512-KjW+RuuNcsIvvNF1ejbBjcDNus/fLz69LGAU2gwhFzw7A0iOUEJJgTWzkGBLZ/YvUaWMDtPnznF3X3oYHeOj6A==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-displace@^0.9.6":
+"@jimp/plugin-displace@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.9.6.tgz#67564d081dc6b19007248ca222d025fd6f90c03b"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.10.1.tgz#fcf683adc4b4bfdd27c77045fc2abeff6521669a"
-  integrity sha512-SWpbrxiHmUYBVWtDDMjaG3eRDBASrTPaad7l07t73/+kmU6owAKWQW6KtVs05MYSJgXz7Ggdr0fhEn9AYLH1Rg==
+  integrity sha512-NUJcjMRb6iR9rwJSC7t8LMJgRs5Z0mzflYBymvttkjlcIoB4RPIOu3gWn5iT5IepB50YTy9zJuCaofMYn4DnaA==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-dither@^0.9.6":
+"@jimp/plugin-dither@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.9.6.tgz#dc48669cf51f3933761aa9137e99ebfa000b8cce"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.10.1.tgz#c75650274b82c0b140f7b9db26167169729742a2"
-  integrity sha512-abm1GjfYK7ru/PoxH9fAUmhl+meHhGEClbVvjjMMe5g2S0BSTvMJl3SrkQD/FMkRLniaS/Qci6aQhIi+8rZmSw==
+  integrity sha512-V/PCL44R16w5EDCgMvFXBaWFQ0f3LLDD3CQxJFOw6awswkP60m13nUUtWHm7QB54Gghhgk8JEOD/mZo6JsnaBg==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-flip@^0.9.6":
+"@jimp/plugin-fisheye@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.9.6.tgz#f81f9b886da8cd56e23dd04d5aa359f2b94f939e"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.10.1.tgz#f482d913d00ef4149e7d4fcce517dd9acc564846"
-  integrity sha512-KFZTzAzQQ5bct3ii7gysOhWrTKVdUOghkkoSzLi+14nO3uS/dxiu8fPeH1m683ligbdnuM/b22OuLwEwrboTHA==
+  integrity sha512-GgIAY6ryL+2RwRb6j+APo972f8VjftolnvjVM1ilxO4pdfJf7gdg3Bp4igka9fgW94BBgdJlCPUeWIVap3AYaA==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-gaussian@^0.9.6":
+"@jimp/plugin-flip@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.9.6.tgz#6c93897ee0ff979466184d7d0ec0fbc95c679be4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.10.1.tgz#e311365b859168b0bef338566868bab9d2ae397d"
-  integrity sha512-WXKLtJKWchXfWHT5HIOq1HkPKpbH7xBLWPgVRxw00NV/6I8v4xT63A7/Nag78m00JgjwwiE7eK2tLGDbbrPYig==
+  integrity sha512-CkSwULwmVYOo6ZY/QnR0/mrfMaf/3g+sDo7osAHaf0GvuoIw76NSh6LwaANAsLZ9erknZ67XuqCjZWoMwNrbaw==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-invert@^0.9.6":
+"@jimp/plugin-gaussian@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.9.6.tgz#4b3fa7b81ea976b09b82b3db59ee00ac3093d2fd"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.10.1.tgz#9c409d7f455397d26acd953c5f03368018d0c38f"
-  integrity sha512-Pab/cupZrYxeRp07N4L5a4C/3ksTN9k6Knm/o2G5C789OF0rYsGGLcnBR/6h69nPizRZHBYdXCEyXYgujlIFiw==
+  integrity sha512-RnmIWUr9RB1RrgqXG2H7C3dyncak/D2CPoP2DehAgxxHprDdxm9HoFjhGQ9eh+Ygr0nXE7t2+fDE12U3VW3ApA==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-mask@^0.9.6":
+"@jimp/plugin-invert@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.9.6.tgz#d70be0030ab3294b191f5b487fb655d776820b19"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.10.1.tgz#cf5e711c1cd864bb4fc46bd00a8b2a40d5058a61"
-  integrity sha512-ikypRoDJkbxXlo6gW+EZOcTiLDIt0DrPwOFMt1bvL8UV2QPgX+GJ685IYwhIfEhBf/GSNFgB/NYsVvuSufTGeg==
+  integrity sha512-PpTUbnjsAkw0nZnbZWrKdsEW46MARhzzabBXy/XCjvutG3jzoO8EL19VeEtcrxBml9duJbaOzdzYmbFkQsNINQ==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-normalize@^0.9.6":
+"@jimp/plugin-mask@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.9.6.tgz#c9128412a53485d91236a1da241f3166e572be4a"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.10.1.tgz#4ed7ade8b37eca9493977703c26ad64e748460ad"
-  integrity sha512-V3GeuAJ1NeL7qsLoDjnypJq24RWDCwbXpKhtxB+Yg9zzgOCkmb041p7ysxbcpkuJsRpKLNABZeNCCqd83bRawA==
+  integrity sha512-Fm75MSucSGI19n9beXGVPSR98flXpzJLyOfSj0+zefXafrO+kmYO9eWtzNd3TE6jzyGe5y7mPJPHB0PWXKgw4g==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-print@^0.9.6":
+"@jimp/plugin-normalize@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.9.6.tgz#fea31ffeafee18ae7b5cfd6fa131bb205abfee51"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.10.1.tgz#fadd955754ea077afb0fb59352c54088a9ca0981"
-  integrity sha512-gKkqZZPQtMSufHOL0mtJm5d/KI2O6+0kUpOBVSYdGedtPXA61kmVnsOd3wwajIMlXA3E0bDxLXLdAguWqjjGgw==
+  integrity sha512-mxjRCmUB/yD973pgjAKb3HCYMyh1GvGtdo71+pJn+ChefvTJ0LDB1FknwTVjDtJuy4mBh0TkBqBp4PNAtdBL6w==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
+    core-js "^3.4.1"
+
+"@jimp/plugin-print@^0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.10.1.tgz#d39a01b5bf8a3087e102637920672ff45f1e5047"
+  integrity sha512-eSPTbdES/ISR9nMHV8e449UMs0Dx0eY9OixU7gIYTDnTmnhyYXq9bqIY/IXqVU3fOj330MIpIpi6pavmtJXdLA==
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
     load-bmfont "^1.4.0"
 
-"@jimp/plugin-resize@^0.9.6":
+"@jimp/plugin-resize@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.9.6.tgz#7fb939c8a42e2a3639d661cc7ab24057598693bd"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.10.1.tgz#0a294b8dae1efd96ac53bdcd40f7ab58cc2e4f5e"
-  integrity sha512-r5wJcVII7ZWMuY2l6WSbHPG6gKMFemtCHmJRXGUu+/ZhPGBz3IFluycBpHkWW3OB+jfvuyv1EGQWHU50N1l8Og==
+  integrity sha512-aG42+tRmhAYKvybZteSD7s48dAcYSkipyM+e2aizRa0D0FHNIQlIHribiKfRTiX+ewx/fhHVu0vpFKOg0N2hDw==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-rotate@^0.9.6":
+"@jimp/plugin-rotate@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.9.6.tgz#06d725155e5cdb615133f57a52f5a860a9d03f3e"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.10.1.tgz#4e0315cc582afdde90a4f8b56434046c49da015f"
-  integrity sha512-B2nm/eO2nbvn1DgmnzMd79yt3V6kffhRNrKoo2VKcKFiVze1vGP3MD3fVyw5U1PeqwAFu7oTICFnCf9wKDWSqg==
+  integrity sha512-R+Qpb3cwKl6L5m9RUkJatY5D5JuPg/uUfFbdFPaBhc5infC46Rsyt0j923eUyXkisechRDmzoTbG3fcc1MjzSA==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugin-scale@^0.9.6":
+"@jimp/plugin-scale@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.9.6.tgz#3fa939c1a4f44383e12afeb7c434eb41f20e4a1c"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.10.1.tgz#e5cf6150867738c5c4fa9e04f125a9d714b21b67"
-  integrity sha512-DLsLB5S3mh9+TZY5ycwfLgOJvUcoS7bP0Mi3I8vE1J91qmA+TXoWFFgrIVgnEPw5jSKzNTt8WhykQ0x2lKXncw==
+  integrity sha512-MKmW3Rr0sSApglUYFqJ8LgGy9Nm9w2oRgSB2twxA5bp1waM9fdOILcRyEnltwHIIDSoyR0me8XmpuwpyqaqSdA==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
 
-"@jimp/plugins@^0.9.6":
+"@jimp/plugin-shadow@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.9.6.tgz#a1cfdf9f3e1adf5b124686486343888a16c8fd27"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.10.1.tgz#d564a1ac7552c2423fb4b41c4af78a84b8177032"
-  integrity sha512-eQI29e+K+3L/fb5GbPgsBdoftvaYetSOO2RL5z+Gjk6R4EF4QFRo63YcFl+f72Kc1b0JTOoDxClvn/s5GMV0tg==
+  integrity sha512-H4JSVimD19vbFiX8SL3Ci5Htsbb3xG8zQrkjf+ui/2MXbeP0FyWlIv3g1Ahil4oE+5Wi4zbq20Dyba2GS4aINw==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/plugin-blit" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
-    "@jimp/plugin-blur" "^0.9.6"
+    core-js "^3.4.1"
-    "@jimp/plugin-color" "^0.9.6"
+
-    "@jimp/plugin-contain" "^0.9.6"
+"@jimp/plugin-threshold@^0.10.1":
-    "@jimp/plugin-cover" "^0.9.6"
+  version "0.10.1"
-    "@jimp/plugin-crop" "^0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.10.1.tgz#4097c91aab749b140f7edc4c7066803a69bf9fb3"
-    "@jimp/plugin-displace" "^0.9.6"
+  integrity sha512-o2nBEz2tLvfYNMdac9qho5SrjFoBfbJow8PWXMWz14N6zLKIw4DQT+inSbEKxbxlqKseds3zUsOIM+0hLbSDeQ==
-    "@jimp/plugin-dither" "^0.9.6"
+  dependencies:
-    "@jimp/plugin-flip" "^0.9.6"
+    "@babel/runtime" "^7.7.2"
-    "@jimp/plugin-gaussian" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
-    "@jimp/plugin-invert" "^0.9.6"
+    core-js "^3.4.1"
-    "@jimp/plugin-mask" "^0.9.6"
+
-    "@jimp/plugin-normalize" "^0.9.6"
+"@jimp/plugins@^0.10.1":
-    "@jimp/plugin-print" "^0.9.6"
+  version "0.10.1"
-    "@jimp/plugin-resize" "^0.9.6"
+  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.10.1.tgz#e9a126bbed7058e6351d08454249a7934d4bd69c"
-    "@jimp/plugin-rotate" "^0.9.6"
+  integrity sha512-gpdoh7XITd33ZClObVKYV8ASpZnrwebNuY4C5njeJfLxfyRQ2wSK9TDAb/5OYcyrbMDIqBaKLg9AXHPBphwXtg==
-    "@jimp/plugin-scale" "^0.9.6"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/plugin-blit" "^0.10.1"
+    "@jimp/plugin-blur" "^0.10.1"
+    "@jimp/plugin-circle" "^0.10.1"
+    "@jimp/plugin-color" "^0.10.1"
+    "@jimp/plugin-contain" "^0.10.1"
+    "@jimp/plugin-cover" "^0.10.1"
+    "@jimp/plugin-crop" "^0.10.1"
+    "@jimp/plugin-displace" "^0.10.1"
+    "@jimp/plugin-dither" "^0.10.1"
+    "@jimp/plugin-fisheye" "^0.10.1"
+    "@jimp/plugin-flip" "^0.10.1"
+    "@jimp/plugin-gaussian" "^0.10.1"
+    "@jimp/plugin-invert" "^0.10.1"
+    "@jimp/plugin-mask" "^0.10.1"
+    "@jimp/plugin-normalize" "^0.10.1"
+    "@jimp/plugin-print" "^0.10.1"
+    "@jimp/plugin-resize" "^0.10.1"
+    "@jimp/plugin-rotate" "^0.10.1"
+    "@jimp/plugin-scale" "^0.10.1"
+    "@jimp/plugin-shadow" "^0.10.1"
+    "@jimp/plugin-threshold" "^0.10.1"
     core-js "^3.4.1"
     timm "^1.6.1"
 
-"@jimp/png@^0.9.6":
+"@jimp/png@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.9.6.tgz#00ed7e6fb783b94f2f1a9fadf9a42bd75f70cc7f"
+  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.10.1.tgz#aff93621b278bca73e46bf951d2e44b1381c5139"
-  integrity sha512-9vhOG2xylcDqPbBf4lzpa2Sa1WNJrEZNGvPvWcM+XVhqYa8+DJBLYkoBlpI/qWIYA+eVWDnLF3ygtGj8CElICw==
+  integrity sha512-/2CUaOjbq5GVaXKRGzM4nhhFpnVdWNazsuVZ3Et8sgMxJxep7v6k2hmvL8rr0/A4UPPWzEbFsagz/YBbN9fANw==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.9.6"
+    "@jimp/utils" "^0.10.1"
     core-js "^3.4.1"
     pngjs "^3.3.3"
 
-"@jimp/tiff@^0.9.6":
+"@jimp/tiff@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.9.6.tgz#9ff12122e727ee15f27f40a710516102a636f66b"
+  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.10.1.tgz#602e5d7c3434094e5e29642659af2f5da0061e12"
-  integrity sha512-pKKEMqPzX9ak8mek2iVVoW34+h/TSWUyI4NjbYWJMQ2WExfuvEJvLocy9Q9xi6HqRuJmUxgNIiC5iZM1PDEEfg==
+  integrity sha512-lvCzid4RwCZr/Zz3W4xTD/UKe4xjVdPk2dGGozrW0Puo2TCz5L+ghXYEWxzoj/rm/wOFmQbaYdopv0UQ72HqWw==
   dependencies:
     "@babel/runtime" "^7.7.2"
     core-js "^3.4.1"
     utif "^2.0.1"
 
-"@jimp/types@^0.9.6":
+"@jimp/types@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.9.6.tgz#7be7f415ad93be733387c03b8a228c587a868a18"
+  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.10.1.tgz#7cbeff8b189b2d7c49b8f8bdaee4d6c814d8e4ff"
-  integrity sha512-PSjdbLZ8d50En+Wf1XkWFfrXaf/GqyrxxgIwFWPbL+wrW4pmbYovfxSLCY61s8INsOFOft9dzzllhLBtg1aQ6A==
+  integrity sha512-PaPhpeHE41Yn6myvnHmrb1FNvn+XmF+EpizhP8JR3DmyveUPblrssM8qA5iMe+Q+wG3vJ02LHNgbfFCUYJr3zA==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/bmp" "^0.9.6"
+    "@jimp/bmp" "^0.10.1"
-    "@jimp/gif" "^0.9.6"
+    "@jimp/gif" "^0.10.1"
-    "@jimp/jpeg" "^0.9.6"
+    "@jimp/jpeg" "^0.10.1"
-    "@jimp/png" "^0.9.6"
+    "@jimp/png" "^0.10.1"
-    "@jimp/tiff" "^0.9.6"
+    "@jimp/tiff" "^0.10.1"
     core-js "^3.4.1"
     timm "^1.6.1"
 
-"@jimp/utils@^0.9.6":
+"@jimp/utils@^0.10.1":
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.9.6.tgz#a3e6c29e835e2b9ea9f3899c9d3d230dc63bd518"
+  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.10.1.tgz#35187bd28268dbb4cfc2b07c71e59f6be0303bf8"
-  integrity sha512-kzxcp0i4ecSdMXFEmtH+NYdBQysINEUTsrjm7v0zH8t/uwaEMOG46I16wo/iPBXJkUeNdL2rbXoGoxxoeSfrrA==
+  integrity sha512-Q0ZT2FGPQo3lXkUheAsg0dVWo0Ko+vYCVJLEUxQMxmPiDLUquE22iya+tMONPOaRj1GG3cznaSqaEHDNgoyYbw==
   dependencies:
     "@babel/runtime" "^7.7.2"
     core-js "^3.4.1"
+    regenerator-runtime "^0.13.3"
 
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
@@ -523,6 +564,23 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
+babel-polyfill@^6.23.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+  integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
+  dependencies:
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
+    regenerator-runtime "^0.10.5"
+
+babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -837,6 +895,11 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
+core-js@^2.4.0, core-js@^2.5.0:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+
 core-js@^3.4.0, core-js@^3.4.1:
   version "3.6.4"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz#440a83536b458114b9cb2ac1580ba377dc470647"
@@ -1240,13 +1303,6 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
-font-manager@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/font-manager/-/font-manager-0.3.0.tgz#9efdc13e521a3d8752e7ab56c3938818043a311f"
-  integrity sha512-6N3pzO+9kxE3yD9c4VN7reg5fqgFvjcUdxZmwauRzsExaeKRu0APfEi3DOISFakokybgKlZcLFQHawwc2TMpQQ==
-  dependencies:
-    nan ">=2.10.0"
-
 for-each@^0.3.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
@@ -1685,15 +1741,15 @@ itunes-nowplaying-mac@0.3.1:
   resolved "https://registry.yarnpkg.com/itunes-nowplaying-mac/-/itunes-nowplaying-mac-0.3.1.tgz#3f5ee853aef843e66c20ae10b9439303bc1a4986"
   integrity sha512-kZ/ef1rMzl/CMc1RBh3z99wqijxQgz5Vn1gLCrE1OqRwj9bq2vbgeIqWjJC8iDWZHRolizdTPfKMAbp8yKYFTQ==
 
-jimp@^0.9.6:
+jimp@^0.10.1:
-  version "0.9.6"
+  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.9.6.tgz#abf381daf193a4fa335cb4ee0e22948049251eb9"
+  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.10.1.tgz#052fbf00fd955ada1bfc0f9c3a16d4980bd3178a"
-  integrity sha512-DBDHYeNVqVpoPkcvo0PKTNGvD+i7NYvkKTsl0I3k7ql36uN8wGTptRg0HtgQyYE/bhGSLI6Lq5qLwewaOPXNfg==
+  integrity sha512-dRs9hdUXseS7y214GxZxeLiXNQZUXnjdzv9I5+FVWAnyK0bdIGgjUn5WLuNF4uAKkzIH3cFA24EbviOlBIpRDg==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    "@jimp/custom" "^0.9.6"
+    "@jimp/custom" "^0.10.1"
-    "@jimp/plugins" "^0.9.6"
+    "@jimp/plugins" "^0.10.1"
-    "@jimp/types" "^0.9.6"
+    "@jimp/types" "^0.10.1"
     core-js "^3.4.1"
     regenerator-runtime "^0.13.3"
 
@@ -1745,10 +1801,10 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^2.1.0, json5@^2.1.2:
+json5@^2.1.0, json5@^2.1.3:
-  version "2.1.2"
+  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
+  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
   dependencies:
     minimist "^1.2.5"
 
@@ -1965,11 +2021,6 @@ ms@^2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-nan@>=2.10.0:
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
-  integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
-
 node-abi@^2.11.0:
   version "2.12.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.12.0.tgz#40e9cfabdda1837863fa825e7dfa0b15686adf6f"
@@ -2378,6 +2429,16 @@ readline-sync@1.4.10:
   resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b"
   integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==
 
+regenerator-runtime@^0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+  integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
+
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
 regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.3:
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
@@ -2760,6 +2821,14 @@ sweetalert2@^9.10.9:
   resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-9.10.9.tgz#a727178ea89a0976d3d1bf6ee9ea94d25cef59d1"
   integrity sha512-EvCwcS9omZHhxp8XXiWwPMGq2ywGcU0VXeBr3DCibUMmfRkh8f8SxBWFSKMtw57HnK0tKYDhyhQV/vFERtRciQ==
 
+system-font-families@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/system-font-families/-/system-font-families-0.4.1.tgz#ea35b06989629603010c0ed02d4ba264bfa3e374"
+  integrity sha512-XQK5qAYsbEI6SkCEwezRDsPV44T2G4NNQ/xcx7D/8XM3S+rqYlNxsGcLT7vO6vdT4hc/mlRef7S6+KGIetTwdg==
+  dependencies:
+    babel-polyfill "^6.23.0"
+    ttfinfo "https://github.com/rBurgett/ttfinfo.git"
+
 tar@^4.4.12:
   version "4.4.13"
   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
@@ -2830,6 +2899,10 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
   integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
+"ttfinfo@https://github.com/rBurgett/ttfinfo.git":
+  version "0.2.0"
+  resolved "https://github.com/rBurgett/ttfinfo.git#f00e43e2a6d4c8a12a677df20b7804492d50863c"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"