TheDesk Usain (18.10.1)

Bump jimp from 0.8.2 to 0.8.3 in /app

.travis.yml

@@ -16,12 +16,12 @@ before_deploy:
   - VERSION=$(cat package.json | grep version | head -1 | awk -F= "{ print $2 }" | sed 's/[version:,\",]//g' | tr -d '[[:space:]]')
   - yarn install --no-lockfile --prod
   - yarn construct
-  #- if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
-  #- if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
-  #- if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
-  #- if [ "$TRAVIS_OS_NAME" = "linux" ];then ls;else :;fi
-  #- if [ "$TRAVIS_OS_NAME" = "linux" ];then mv thedesk-*.zip thedesk.zip;else :;fi
-  #- if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ];then electron-builder --mac -p never;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then electron-builder --linux --x64 -p never;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../build;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then ls;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then mv thedesk-*.zip thedesk.zip;else :;fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ];then cd ../app;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then yarn add electron-builder;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then electron-builder --win --ia32 -p never;else :;fi
   - if [ "$TRAVIS_OS_NAME" = "windows" ];then cd ../build;else :;fi
@@ -49,5 +49,5 @@ deploy:
   skip_cleanup: true
   on:
     repo: cutls/TheDesk
-    tags: false
+    tags: true
     all_branches: true

app/js/lang/lang.bg.js

@@ -107,6 +107,8 @@ var lang={
     "lang_tags_tagwarn": "Автоматично попълване на {{tag}}, ако раздумката няма {{tag}}",
     "lang_tl_media": "Media",
     "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_tl_postmarkers_title": "Process...",
+    "lang_tl_postmarkers": "POST markers data. Please wait",
     "lang_img_DLDone": "Downloaded:",
     "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
     "lang_layout_thisacct": "{{notf}} of this account",

app/js/lang/lang.cs.js

@@ -107,6 +107,8 @@ var lang={
     "lang_tags_tagwarn": "Auto complete {{tag}}, if toot without {{tag}}",
     "lang_tl_media": "Média",
     "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_tl_postmarkers_title": "Process...",
+    "lang_tl_postmarkers": "POST markers data. Please wait",
     "lang_img_DLDone": "Downloaded:",
     "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.",
     "lang_layout_thisacct": "{{notf}} tohoto účtu",

app/js/lang/lang.de.js

@@ -107,6 +107,8 @@ var lang={
     "lang_tags_tagwarn": "Automatisch {{tag}} anfügen, wenn Tröt ohne {{tag}} ist",
     "lang_tl_media": "Medien",
     "lang_tl_reconnect": "Mit Streaming API erneut verbinden",
+    "lang_tl_postmarkers_title": "Process...",
+    "lang_tl_postmarkers": "POST markers data. Please wait",
     "lang_img_DLDone": "Heruntergeladen:",
     "lang_layout_gotop": "Gehen Sie zum Anfang dieser Spalte. Wenn das Symbol rot ist, kann diese Spalte keine Verbindung zur Streaming-API herstellen. Bitte neu laden.",
     "lang_layout_thisacct": "{{notf}} dieses Kontos",

app/js/lang/lang.en.js

@@ -131,6 +131,8 @@ var lang = {
     //tl/tl.js
     "lang_tl_media": "Media",
     "lang_tl_reconnect": "Reconnect to streaming API",
+    "lang_tl_postmarkers_title": "Process...",
+    "lang_tl_postmarkers": "POST markers data. Please wait",
     //ui/img.js
     "lang_img_DLDone": "Downloaded:",
     //ui/layout.js

app/js/lang/lang.ja.js

@@ -131,6 +131,8 @@ var lang = {
     //tl/tl.js
     "lang_tl_media": "メディア",
     "lang_tl_reconnect": "Streamingに再接続しました",
+    "lang_tl_postmarkers_title": "処理中",
+    "lang_tl_postmarkers": "未読マーカーを送信しています。3秒以内に閉じられます。",
     //ui/img.js
     "lang_img_DLDone": "ダウンロード先:",
     //ui/layout.js

app/js/platform/end.js

@@ -183,6 +183,10 @@ onmessage = function (e) {
 		updateMess(e.data[1]);
 	} else if (e.data[0] == "renderAbout") {
 		renderAbout(e.data[1]);
+	} else if (e.data[0] == "asRead") {
+		asRead()
+	} else if (e.data[0] == "asReadEnd") {
+		asReadEnd()
 	} else if (e.data[0] == "alert") {
 		Swal.fire({
 			type: 'info',

app/js/platform/preload.js

@@ -57,6 +57,8 @@ onmessage = function (e) {
         ipc.send('download-btn', e.data[1]);
     } else if (e.data[0] == "nano") {
         ipc.send('nano', null);
+    } else if (e.data[0] == "asReadComp") {
+        ipc.send('sendMarkersComplete', null);
     }
 }
 //version.js
@@ -164,6 +166,12 @@ ipc.on('prog', function (event, arg) {
 ipc.on('mess', function (event, arg) {
     postMessage(["updateMess", arg], "*")
 })
+ipc.on('asRead', function (event, arg) {
+    postMessage(["asRead", ""], "*")
+})
+ipc.on('asReadEnd', function (event, arg) {
+    postMessage(["asReadEnd", ""], "*")
+})
 var webviewDom = document.getElementById('webview');
 if (webviewDom) {
     webviewDom.addEventListener('new-window', function (e) {

app/js/tl/notification.js

@@ -100,10 +100,10 @@ function notfColumn(acct_id, tlid, sys) {
 			todc();
 			//Markers
 			var markers = localStorage.getItem("markers");
-			if (markers == "no") {
-				markers = false;
+			if (markers == "yes") {
+				markers = true;
 			} else {
-				markers = true
+				markers = false
 			}
 			if (markers) {
 				getMarker(tlid, "notf", acct_id)

app/js/tl/tl.js

@@ -153,10 +153,10 @@ function tl(type, data, acct_id, tlid, delc, voice, mode) {
 		if (type == "home" || type == "notf") {
 			//Markers
 			var markers = localStorage.getItem("markers");
-			if (markers == "no") {
-				markers = false;
+			if (markers == "yes") {
+				markers = true;
 			} else {
-				markers = true
+				markers = false
 			}
 			if (markers) {
 				getMarker(tlid, type, acct_id)
@@ -999,24 +999,24 @@ function ueload(tlid) {
 			columnReload(tlid, type)
 		}
 		if (localStorage.getItem("filter_" + acct_id) != "undefined") {
-			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type);
+			var mute = getFilterType(JSON.parse(localStorage.getItem("filter_" + acct_id)), type)
 		} else {
-			var mute = [];
+			var mute = []
 		}
-		var templete = parse(json, '', acct_id, tlid, "", mute, type);
+		var templete = parse(json, '', acct_id, tlid, "", mute, type)
 		var len = json.length - 1
-		$("#timeline_" + tlid).prepend(templete);
+		$("#timeline_" + tlid).prepend(templete)
 		if ($("#timeline_" + tlid + " .cvo:eq(" + len + ")").length) {
 			var to = $("#timeline_" + tlid + " .cvo:eq(" + len + ")").offset().top
 			$("#timeline_box_" + tlid + "_box .tl-box").scrollTop(to)
 		}
-		additional(acct_id, tlid);
-		jQuery("time.timeago").timeago();
-		todc();
+		additional(acct_id, tlid)
+		jQuery("time.timeago").timeago()
+		todc()
 		ueloadlock = false
 	});
 }
-function asRead() {
+function asRead(callback) {
 	//Markers
 	var markers = localStorage.getItem("markers");
 	if (markers == "no") {
@@ -1027,7 +1027,9 @@ function asRead() {
 	if (markers) {
 		var multi = localStorage.getItem("column")
 		var obj = JSON.parse(multi)
-		for (var i = 0; i < obj.length; i++) {
+		var obl = obj.length
+		ct = 0
+		for (var i = 0; i < obl; i++) {
 			var acct_id = obj[i].domain
 			var type = obj[i].type
 			if (type == "home" || type == "notf") {
@@ -1046,23 +1048,53 @@ function asRead() {
 						}
 					}
 				}
-				var domain = localStorage.getItem("domain_" + acct_id);
-				var at = localStorage.getItem("acct_" + acct_id + "_at");
-				var httpreq = new XMLHttpRequest();
+
+				var domain = localStorage.getItem("domain_" + acct_id)
+				var at = localStorage.getItem("acct_" + acct_id + "_at")
+				var httpreq = new XMLHttpRequest()
 				var start = "https://" + domain + "/api/v1/markers"
-				httpreq.open('POST', start, true);
-				httpreq.setRequestHeader('Content-Type', 'application/json');
-				httpreq.setRequestHeader('Authorization', 'Bearer ' + at);
-				httpreq.responseType = "json";
-				httpreq.send(JSON.stringify(poster));
+				httpreq.open('POST', start, true)
+				httpreq.setRequestHeader('Content-Type', 'application/json')
+				httpreq.setRequestHeader('Authorization', 'Bearer ' + at)
+				httpreq.responseType = "json"
+				httpreq.send(JSON.stringify(poster))
 				httpreq.onreadystatechange = function () {
 					if (httpreq.readyState === 4) {
-						var json = httpreq.response;
+						var json = httpreq.response
 						console.log(json)
+						ct++
+						if (ct == obl && callback) {
+							postMessage(["asReadComp", ""], "*")
+						}
 					}
 				}
 			}
 		}
 	}
 }
-cbTimer1 = setInterval(asRead, 60000);
+function asReadEnd() {
+	//Markers
+	var markers = localStorage.getItem("markers");
+	if (markers == "no") {
+		markers = false;
+	} else {
+		markers = true
+	}
+	if (markers) {
+		asRead(true)
+		Swal.fire({
+			title: lang.lang_tl_postmarkers_title,
+			html: lang.lang_tl_postmarkers,
+			timer: 3000,
+			onBeforeOpen: () => {
+				Swal.showLoading()
+			},
+			onClose: () => {
+			}
+		}).then((result) => {
+
+		})
+	} else {
+		postMessage(["asReadComp", ""], "*")
+	}
+}

app/js/ui/layout.js

@@ -217,10 +217,10 @@ function parseColumn(target, dontclose) {
 				unread = ""
 			}
 			var markers = localStorage.getItem("markers");
-			if (markers == "no") {
-				markers = false;
+			if (markers == "yes") {
+				markers = true;
 			} else {
-				markers = true
+				markers = false
 			}
 			if (!markers) {
 				unread = ""

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 app = electron.app;
 // ウィンドウを作成するモジュール
@@ -29,8 +30,8 @@ if (!gotTheLock) {
 		// 多重起動を試みた場合、既に存在するウィンドウにフォーカスを移す
 		// Someone tried to run a second instance, we should focus our window.
 		if (mainWindow) {
-		if (mainWindow.isMinimized()) mainWindow.restore()
-		mainWindow.focus()
+			if (mainWindow.isMinimized()) mainWindow.restore()
+			mainWindow.focus()
 		}
 	})
 }
@@ -40,18 +41,18 @@ if (process.argv.indexOf("--dev") === -1) {
 } else {
 	var packaged = false;
 	console.log(
-		"||\\\\\\ \n"+
-		"||||  \\\\\\\\ \n"+
-		"||||     \\\\\\\\ \n"+
-		"|||| Am I a \\\\\\\\ \n"+
-		"|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n"+
-		"||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n"+
-		"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n"+
-		"|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/\__ \\   < \n"+
-		"||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n"+
-		"||||          /////         \n"+
-		"||||       /////\n"+
-		"||||     /////\n"+
+		"||\\\\\\ \n" +
+		"||||  \\\\\\\\ \n" +
+		"||||     \\\\\\\\ \n" +
+		"|||| Am I a \\\\\\\\ \n" +
+		"|||| cat? ^ ^   \\\\\\\\\\       _____ _          ____            _    \n" +
+		"||||     (.-.)   \\\\\\\\\\      |_   _| |__   ___|  _ \\  ___  ___| | __\n" +
+		"||||  ___>   )    |||||       | | | '_ \\ / _ \\ | | |/ _ \\/ __| |/ /\n" +
+		"|||| <   _  _)   //////       | | | | | |  __/ |_| |  __/\__ \\   < \n" +
+		"||||  |_||_|   /////          |_| |_| |_|\\___|____/ \\___||___/_|\\_\\ \n" +
+		"||||          /////         \n" +
+		"||||       /////\n" +
+		"||||     /////\n" +
 		"||||//////"
 	)
 	console.log("Welcome!")
@@ -63,9 +64,9 @@ var ha_path = join(app.getPath("userData"), "hardwareAcceleration");
 try {
 	fs.readFileSync(ha_path, 'utf8');
 	app.disableHardwareAcceleration()
-	if(!packaged) console.log("disabled: Hardware Acceleration");
+	if (!packaged) console.log("disabled: Hardware Acceleration");
 } catch{
-	if(!packaged) console.log("enabled: Hardware Acceleration");
+	if (!packaged) console.log("enabled: Hardware Acceleration");
 }
 var window_size;
 try {
@@ -131,8 +132,8 @@ function createWindow() {
 			fs.writeFileSync(lang_path, lang);
 		});
 	}
-	if(!packaged) console.log("your lang:" + app.getLocale());
-	if(!packaged) console.log("launch:" + lang);
+	if (!packaged) console.log("your lang:" + app.getLocale());
+	if (!packaged) console.log("launch:" + lang);
 	// メイン画面の表示。ウィンドウの幅、高さを指定できる
 	var platform = process.platform;
 	var bit = process.arch;
@@ -173,7 +174,7 @@ function createWindow() {
 		if (window_size.max) {
 			mainWindow.maximize();
 		}
-	  })
+	})
 	electron.session.defaultSession.clearCache(() => { })
 	if (process.argv) {
 		if (process.argv[1]) {
@@ -200,7 +201,27 @@ function createWindow() {
 		electron.ipcMain.removeAllListeners();
 		mainWindow = null;
 	});
-	mainWindow.on('close', function () {
+	closeArg = false
+	mainWindow.on('close', function (e, arg) {
+			if(!closeArg){
+				e.preventDefault()
+			}
+			const promise = new Promise(function (resolve) {
+				mainWindow.webContents.send('asReadEnd', "")
+				setTimeout(function () { resolve() }, 3000)
+			})
+			promise.then((function (response) {
+				writePos(mainWindow)
+				closeArg = true
+				mainWindow.close()
+			})
+			);
+	});
+	electron.ipcMain.on('sendMarkersComplete', function (e, arg) {
+		closeArg = true
+		mainWindow.close()
+	})
+	function writePos(mainWindow){
 		if (
 			max_window_size.width == mainWindow.getBounds().width &&
 			max_window_size.height == mainWindow.getBounds().height &&
@@ -211,11 +232,14 @@ function createWindow() {
 		} 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));
-	});
+		fs.writeFileSync(info_path, JSON.stringify(size))
+	}
 	mainWindow.on('maximize', function () {
 		fs.writeFileSync(max_info_path, JSON.stringify(mainWindow.getBounds()));
 	});
+	mainWindow.on('minimize', function () {
+		mainWindow.webContents.send('asRead', "")
+	})
 
 	var platform = process.platform;
 	var bit = process.arch;
@@ -230,6 +254,29 @@ function createWindow() {
 	np.TheDeskNowPlaying(mainWindow);
 	//その他system
 	systemFunc.system(mainWindow, dir, lang, dirname);
+	setInterval(function () { mouseTrack(mainWindow) }, 1000);
+}
+var x = 0
+var y = 0
+var unchanged = 0
+var locked = false
+function mouseTrack(mainWindow) {
+	let mousePos = electron.screen.getCursorScreenPoint()
+	let xNow = mousePos.x
+	let yNow = mousePos.x
+	if (x != xNow || y != yNow) {
+		unchanged = 0
+		locked = false
+	} else {
+		unchanged++
+		if (unchanged > 60 && !locked) {
+			unchanged = 0
+			locked = true
+			mainWindow.webContents.send('asRead', "")
+		}
+	}
+	x = xNow
+	y = yNow
 }
 // Electronの初期化完了後に実行
 app.on('ready', createWindow);

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thedesk",
-  "version": "18.10.0",
+  "version": "18.10.1",
   "description": "TheDesk is a Mastodon client for PC.",
   "repository": "https://github.com/cutls/TheDesk",
   "main": "main.js",
@@ -49,24 +49,24 @@
   ],
   "license": "GPL-3.0",
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.10.1",
+    "@fortawesome/fontawesome-free": "^5.11.1",
     "electron-dl": "^1.14.0",
-    "jimp": "^0.8.2",
+    "jimp": "^0.8.3",
     "jquery": "^3.4.1",
     "jquery-ui-dist": "^1.12.1",
     "json5": "^2.1.0",
     "materialize-css": "^1.0.0",
     "node-notifier": "^5.4.0",
     "sumchecker": "^3.0.0",
-    "sweetalert2": "^8.13.0",
+    "sweetalert2": "^8.17.6",
     "vue": "^2.6.10"
   },
   "optionalDependencies": {
-    "itunes-nowplaying-mac": "kPherox/itunes-nowplaying-mac#get-artworks-base64",
-    "font-manager": "^0.3.0"
+    "font-manager": "^0.3.0",
+    "itunes-nowplaying-mac": "kPherox/itunes-nowplaying-mac#get-artworks-base64"
   },
   "devDependencies": {
-    "electron": "^6.0.0",
+    "electron": "^6.0.10",
     "electron-builder": "^21.1.5",
     "electron-rebuild": "^1.8.6",
     "readline-sync": "1.4.10"

app/view/make/index.sample.html

@@ -714,13 +714,14 @@
 				<a href="https://ja.mstdn.wiki/TheDesk" target="_blank">機能一覧</a><br>
 				Pixiv Fanboxでは支援者様限定で様々なTheDeskに関する記事をご覧いただけます。最低月一更新。<br>
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
-				<h5>Release Note Usamin (18.10.0)</h5>
-				・全てのカラムの縦、横幅を自由に変更できるように。<br>
-				・一部トゥートがTLに表示されない不具合を修正。<br>
-				・初回起動時にガイダンスを表示<br>
-				・Featured tag(master|v3.0)<br>
-				・未読マーカー(master|v3.0)<br>
-				・引用のトゥート(設定で引用形式を「パラメーター」にすることで対応インスタンスで利用可)<br>
+				<h5>Release Note Usamin (18.10.1)</h5>
+				・Markers(3.0.0 rc1)の送信タイミングを変更。デフォルトでオフに。<br>
+				・通知音の音量が調節できる<br>
+				・v1検索API全廃に対応<br>
+				・投票ボタン押した後に情報が更新されない(投票済みにならない)不具合を修正<br>
+				・Unknownなメディアの拡張子を表示<br>
+				・Pleromaでタグメニューが出ずにTL追加になる不具合を修正<br>
+				・削除して再編集でアカウントが切り替えできてしまう不具合を修正<br>
 			</div>
 			<div id="release-en" style="display:none">
 				<h5>Let's make it native!</h5>

app/view/make/make.js

@@ -1,5 +1,5 @@
 const fs = require("fs")
-let ver = "Usamin (18.10.1)-beta"
+let ver = "Usamin (18.10.1)"
 const execSync = require('child_process').execSync;
 let gitHash = execSync("git rev-parse HEAD").toString().trim()
 fs.writeFileSync("../../git", gitHash)

app/view/make/setting.sample.js

@@ -311,7 +311,7 @@ var tlConstruction = [
         id: "markers",
         storage: "markers",
         checkbox: true,
-        setValue: "yes",
+        setValue: "no",
         text: {
             head: "@@markers@@",
             desc: "@@markerswarn@@",

app/yarn.lock

@@ -15,26 +15,26 @@
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
 
-"@fortawesome/fontawesome-free@^5.10.1":
-  version "5.10.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.10.2.tgz#27e02da1e34b50c9869179d364fb46627b521130"
-  integrity sha512-9pw+Nsnunl9unstGEHQ+u41wBEQue6XPBsILXtJF/4fNN1L3avJcMF/gGF86rIjeTAgfLjTY9ndm68/X4f4idQ==
+"@fortawesome/fontawesome-free@^5.11.1":
+  version "5.11.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.1.tgz#cef685a74708cf57b367c32d9f36a931c5a4e894"
+  integrity sha512-DtXLVYAkDU0ce1cFUgLvZaMd1R2J/LviBYih9xr4ZLhQMrgvYX7w2vOxlpKLRALfIj5GyC5zoVrcACOkLcFgvg==
 
-"@jimp/bmp@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.8.2.tgz#e1a19ae432468497f420483ff27ddf845fa6773b"
-  integrity sha512-TfPFDi+hw/JiMVRiE7l3zI7AUKb/QLJBXBZ1b1PEYGchyfbqfND3NY8ITsJwPcZSkP3ia3jsZ5V5cVpz5P/Rvw==
+"@jimp/bmp@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.8.3.tgz#165a23c6d63e5a0a8e67df49f28f03ab66fa9db4"
+  integrity sha512-V3HW93Z8ReSME1ugzje1lLpnywlMjaZcfDhZ/UtApOIueyqyyx6g0Y4uLTXVqao861N+SbJ2VMIh7X5YggGcNA==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     bmp-js "^0.1.0"
     core-js "^2.5.7"
 
-"@jimp/core@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.8.2.tgz#17a9ff9348979ebe8fa53c4df77347ae7d7d5e60"
-  integrity sha512-/xoJ+YqOd5SsrrZS18NAY8a60p3YjWzDWfwoxGUtl4tAHMsWns7fWvpTPblp1FJ3T98WYLb2kU/HDIokaaghnA==
+"@jimp/core@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.8.3.tgz#495f3e24c26ce5cbe88f8dc0b702220839838e0a"
+  integrity sha512-GOo4o/k/w7MI8tZHDq7xr4s2qDPjtgQKk3ghRk1LGPjdhZK7Xkw5NHMnhgXFQF0IvuaVXBJVDzbRp/ZpvWtntA==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     any-base "^1.1.0"
     buffer "^5.2.0"
     core-js "^2.5.7"
@@ -46,229 +46,229 @@
     pixelmatch "^4.0.2"
     tinycolor2 "^1.4.1"
 
-"@jimp/custom@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.8.2.tgz#1048f7d46c9bf7e791ef74c09407fbb03ca2b6f7"
-  integrity sha512-42Naol9Zn6nIBZNGcMN+Hh2KipnGCUpTPP7p31lYwvT1uCoTs/hTkLye+wJzQz0RevsWkZAER/3sofSB0BHg0g==
+"@jimp/custom@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.8.3.tgz#9aa5b1416fd3631053b168f10643d18b8a77be4f"
+  integrity sha512-YZTtP/xJnFPuEWkrlGXQJTEuETzIZadZaUdqVKpxDDyHKklaszl6KQ0/aIIIReKFYGxR5JWeNnYCgvP8Y4yx3g==
   dependencies:
-    "@jimp/core" "^0.8.2"
+    "@jimp/core" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/gif@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.8.2.tgz#a32d3a20dcdea4eab24314170f37168f79292469"
-  integrity sha512-IGKFmcTh9nuBx43//mPnP+l05hD8OOlUWE+jnkF28Sw46wUIo8MU6Ww/sIeYWdHI0ZnF0cBmJdftX11YKCvR9Q==
+"@jimp/gif@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.8.3.tgz#1ff7f1e461f65dd9b9ae2a06935666e2920b0da3"
+  integrity sha512-Kk3oCJjuTU7gCxkEA7+4y9fHdvtZPa8QtxJhk7+sCvBRkvK7Tz2URl9F1YYP1BqDXNuafNCMpvLgkuRtP4lapA==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
     omggif "^1.0.9"
 
-"@jimp/jpeg@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.8.2.tgz#8f4b8af6e4e43b8e9feb5beaf842c57110102b1d"
-  integrity sha512-tJVWKWn44aAMl5N8o74zpfv3bg/H2pkdo1a8hDb4I24vt6fE3rrIhceWsxA+T9/fgO1XPfWCXAlfxP0WqXJ26w==
+"@jimp/jpeg@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.8.3.tgz#3b649d711345236c0418daa02b4f5f5696f3964f"
+  integrity sha512-wWo1+w8WbnM1kEFXFjvqAQpsuVaLkdiZle17NwrmP+WOWIk/YXonP5cI7Zpp05ghLgudFuvP2/DWu45kyFPA2A==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
     jpeg-js "^0.3.4"
 
-"@jimp/plugin-blit@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.8.2.tgz#4de15595b34c28cdee2afb37c0f1274f97c1f8fc"
-  integrity sha512-cd5LtI5btcTWqm5Ro4wxFjBE4ywMl6sw15i8vb0SJyA+HOjaTWBUSs2khUYprUELCEJzti11xL5W+eN0oX2p6Q==
+"@jimp/plugin-blit@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.8.3.tgz#9815f5f954ee353cb33a27f42160cc3b6dbd21e0"
+  integrity sha512-QwmJQ/eyzqJQRQagNXpUVlJa7eubfZfIGtQtBtCHw8L3jdAiUVQw1g1z14Pm2tg+rqdll13iaIvyxs69sSpI1w==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-blur@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.8.2.tgz#33fe66a789ad3187a0c1d8cea8798c1d0417ae3f"
-  integrity sha512-Zn30zNWkoxYhLym9c+NQxtL96sEaZsCoShmRJaE8D3XfhZ3mYjpwvTpnjEQlgfbqDngVger9VYq9eokBIBETkw==
+"@jimp/plugin-blur@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.8.3.tgz#f66cb2eab20c9e69e578ecbf40b0c03dc73dbaf4"
+  integrity sha512-SqMh7zjnyFexgyM+QG+OjhiFBu+rjU+YDJkpvBF4VPdEMg+Zpi3AGbVf8TVSTLHbquUX7bDAoMj7Rn2MRZsoag==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-color@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.8.2.tgz#9f51311b389fc91885d7dd766dc80f60b67612fa"
-  integrity sha512-qFcoLbQKf+hZUy6btIUVEGoSwO1h6Ct8PRBdI45XYTVMxH2icD+ts4bpxTOwtmCsVlNb3rkCh20/LPYSWPz55A==
+"@jimp/plugin-color@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.8.3.tgz#8c64d9ac91b62ddb9410fd440c29a4c15a2c03ad"
+  integrity sha512-txTY/coiLNBcy8zUjJ3EmvMdc8G5ozOVOBNwrLRWRc4qgZZuTnfWcib/y60OcZcf5cLr+bvEN2S+f1Cw7bgjbQ==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
     tinycolor2 "^1.4.1"
 
-"@jimp/plugin-contain@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.8.2.tgz#1d3fbedfe68ce70d85584289a1ce4e929fafdedc"
-  integrity sha512-m9v32YcH0m//9SyAE/dQs5V1jp764mezTBdPDaHksOpI81/87AQxNZ8+HlWm4jZgVS33OmZ/kVQdkxLDqTuo1g==
+"@jimp/plugin-contain@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.8.3.tgz#e4c804b0133b2387048705efbd73f2a569800193"
+  integrity sha512-7B4hyTuwJSoTMl2E3t/F+Wfu0XAxYsyDjjydyYx7G4L5stjdZneVH01CEW8M1AebqegvEoobT/df5q9eLHPF0g==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-cover@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.8.2.tgz#3d8e81ab4157af2acc6011c0ce12c95b71c293b8"
-  integrity sha512-KxQdUeGSGJkhTQPSR6DMGzEv7QddMfm7GkCOuu7tRlHoitdIUegFtYElodifztESFbsXK+YX6OC+6+aGHZ6BTQ==
+"@jimp/plugin-cover@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.8.3.tgz#d19d4984c9481571d86feaf8f502e150d23d1977"
+  integrity sha512-WC0d1ZvFQrtG2krp2DXqVgarjet7GgNl54VDkE9eJuqVF2ccmQ+zPcE1pyrm+7vVqd6wsBXA63/NLXIwiiuV3A==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-crop@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.8.2.tgz#f87ca01fd0834940bac9b7d1714b27008f87a8d7"
-  integrity sha512-QpaRnNLFjogLs+Brcb0uhTU/3emX+l5FrUiNW0er4LFG8vI2IrooOxiqnTPbUpWjLklgcooctUFba4ls2P3RWg==
+"@jimp/plugin-crop@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.8.3.tgz#e687423e750f1a60d613bfb75132b1a4482c8b73"
+  integrity sha512-Jp8Skude2KehndXQovBCtP9KN4FCg5U7U8hDxYKECAmtqkrBUMyzSxXHb80THfyynxxe5RtTPyHYwSzltPRxLg==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-displace@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.8.2.tgz#50694b4d8d59d5b0643d6536a503a0e2c65a68bf"
-  integrity sha512-dYf+SHel51JeopNZ2uDYQ7HlbofjBOHZeQpYvOiOQFptFYgOqUZLT7qMlKQhtkUiOjHrdmUI3Y0BQU+xJy9AGQ==
+"@jimp/plugin-displace@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.8.3.tgz#40a1cd9f12419997e04b0b9aeaae55f240f15065"
+  integrity sha512-ekMlgYe2nI1Glhcp20FBL91ck/Xv1iXe/EUOM6QiRDdnxJYObeljvCsNA3iEB29nBzIXZTn1MR08Tg+6RciMzg==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-dither@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.8.2.tgz#fd67cdf4271e36b6953957b6095e19aab736d7b4"
-  integrity sha512-dpZwhOTkObClDZPh8RNsp7cWhs5KLoUW9tC0RuD5nO4FpTZRxLsw88uwr6D044pY2DL8jlDGEBiOTD7E62Vldw==
+"@jimp/plugin-dither@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.8.3.tgz#ae250726c406c3885ddac7edad0c7265f0ec5a5e"
+  integrity sha512-elag+hEqvHKVmm/TLN/xwLPzUsBi81TkUeUvgAINath7rCMRDmMH7NJjmvOyd/SVB/Oc37qsTYqkF6DFggn8IA==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-flip@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.8.2.tgz#3dfe1507526eac0a8a791074e087491ff1c43480"
-  integrity sha512-q3mzWyeNfzKX4kI7TOcqfMjQ7aIZyQTNMddFuLgA/YRBJVvSJRYUcRWqcunFYDMkuZKJGthKv0aBwoaGXtdN8g==
+"@jimp/plugin-flip@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.8.3.tgz#d8c748712ffbe2f3dc049af5831afdbb4819c00d"
+  integrity sha512-CwkF9SuIP+g/ccVFkKl9uSaxQ+eI0dE7amfGqx4XGQpBiW7XteCWA3h/Xz2gJHnU8QtXb2JNsi5ZnAgkCG28JQ==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-gaussian@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.8.2.tgz#ebcfa485fc2fa9472d6b873dcb6b1835e3151543"
-  integrity sha512-uDdBhK+Yzk9PxbGgONBsV18X3NR32eZAmYV56Krl+pB/jVeaD9fFK+pexmPQTGFI0hzPNOD2JagmjK+a8y75Tg==
+"@jimp/plugin-gaussian@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.8.3.tgz#bee19e7df2d436e38f17d606c0c856c3c350de6d"
+  integrity sha512-cv2q2UdiOLZB1S7rLely51Kbqug0KZxq1YZfLlri5b88ZJmgqvBswNa3Pcqn8zK1cR9nkfOnZhKKqeSkZLDcTQ==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-invert@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.8.2.tgz#b74512bb5c50fb3a68b0a809e0d4628a4631c626"
-  integrity sha512-JL58rf8K+ZMKOrHR66G6OJ89jvtK7ZLSiiPdm4yfEiHCipPIpSobW2yPQePn6bgBJ1xLM3LfDINsGFT5NwTy0A==
+"@jimp/plugin-invert@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.8.3.tgz#4b92ad6f7839a984c90db67233aaef6b2e655fa3"
+  integrity sha512-gyQBs4j+hHioblD2qYsmRhGyca2i61J1Oqe4aXRytAGvYCTSXIwYMaMKcf82JCuTA59YxP5+0AxOuWIYLfPO/A==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-mask@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.8.2.tgz#4d38098233fa5ca52870ad702766addff3930abd"
-  integrity sha512-YCofzEQ3RaXdWX2GkKH1FsGtu/Y25PeeaVwa7NiI6oWKmmaW0grkwz7SjIEiiWRb7JwfG+nMpESw+Fso4gDqpw==
+"@jimp/plugin-mask@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.8.3.tgz#09c5166629ae8c6fca3f3bd2640eb0aa241915f9"
+  integrity sha512-MUqHmWt2DfrRFnmLb26NreUlhJw/Etj3ODOTjNVX607euBhEj8g5hHcW1+GAeFlAfqLSdBnPqpa60jr0XX6oUQ==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-normalize@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.8.2.tgz#99ff51614a7d80feca65a7dfa92d378d26a5d88f"
-  integrity sha512-idKurFRsodPqTNAv4W4xoby73zoxHrrH57+YY2aP9buUhIHNuNCfPUlfL7Go9+VVhImr6+1UcWqrLPEAcAi9Mg==
+"@jimp/plugin-normalize@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.8.3.tgz#7ba421d1caf4b387349a4a5ffc8fc1c469fc5f74"
+  integrity sha512-FFf0AWBmIwEyix63kk+77oXuaP0J7nImVhXrCKFdRteo5+NkXDiW/xOOSYYYn5NRP7kWJZz7Jao0xGRzoak2HQ==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-print@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.8.2.tgz#6978c6c1f68fbf28bb5cbbac77a1a0b3da66d694"
-  integrity sha512-RJzDheXkcV58hs9F3j/UCTcWO5hInDD8j96cWMnMB8Er12oLykgEy6BQDSAtCgpoyhRUy6MEKCisF9aS4pJTKw==
+"@jimp/plugin-print@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.8.3.tgz#a3338831c14f31f9909eef587e3f14905cbeb832"
+  integrity sha512-5oqKPoSTqa6jljF6XhmahFPxu7qnfW4IIpSwRG1M7dUTJvoBW4v97lgRDRdvJQ3ruHn/a5hXXWAeaSIRRAi0Pg==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
     load-bmfont "^1.4.0"
 
-"@jimp/plugin-resize@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.8.2.tgz#e3f6d0241645e4648586a447820418f5a28ed9f8"
-  integrity sha512-D2z8xbdGI6/PO6ljXgTlz4l9sHBi1Una4vF+ywRvDzHmVSPBIpFcAy03WXHDQ6lOl3NLGlrhAWQYuhdOA/q/Zw==
+"@jimp/plugin-resize@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.8.3.tgz#2f9c6a26d2951132425d4af15c91fbc85d5b813b"
+  integrity sha512-zPysAio8PYUxYN15GVOfUQeUfeqmkDp1lj6dJ3cO4uZ2C24/0FwZ2ePDdwdcqrhGLAKKT2EKldyhMc0IX8wbIg==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-rotate@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.8.2.tgz#679d26b929e95ef0008c993c1d0aa1870de727e2"
-  integrity sha512-7nlFyWJrzOolKMkayuNoRhciSHrsUfpegOFemZ8i+FDx/Dklzcx1wk2WPniICe7RsQBcTYaYncpk3CZwj/K1Vw==
+"@jimp/plugin-rotate@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.8.3.tgz#1abc3fe3675b02ff8dac99f093580889f4681374"
+  integrity sha512-8HaGjOa7Lz8thOKPzhT7mCeC/Uswcq73NwFsZs8+0jT5droOXoK4pa8+o22pKycCOVOdK4f3TH27gZ+09CIIEg==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugin-scale@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.8.2.tgz#01b1f80b5b9ef95df0c4cd6362e1a7c31442412e"
-  integrity sha512-jtXJoxsN87lAkgPXAF+ZPBjxPRjTDNwmdGdk4dIMuoMVGOvc5wlHHRWEJgGpGjxstQVR55cR4FUQAVgcdwZJqQ==
+"@jimp/plugin-scale@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.8.3.tgz#d7612c06a5513bef76769bf28b5355e99137f556"
+  integrity sha512-HUTRYLVGM96waye0fJEJ5vsYTkhfpCBfBNN1qhvmuYDs/xgmqzkcFbLdpi/OWkGCr2V07ej+qK2Wa3plC1BytA==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
 
-"@jimp/plugins@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.8.2.tgz#68aa9d08de60be56a8836b460b7c7785d70b4d10"
-  integrity sha512-eyeHEpIHKMKTv4WGPyUhPfbxbg7+NTWciOW7esTmTWT65gp+ipvQJMWLS4EGMmubf7TP23IS4SV2JUa9CmyOhA==
+"@jimp/plugins@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.8.3.tgz#b014de237d199b58ec4e826f3caedaa5462b1454"
+  integrity sha512-ALC7LD014tHRFnLwy87U4gsv+bH6VVjBgWdWBZRDhYQiQFtfKmjpteWeXcj6KFu547BsvYxolqw4TkVo/ZWYpA==
   dependencies:
-    "@jimp/plugin-blit" "^0.8.2"
-    "@jimp/plugin-blur" "^0.8.2"
-    "@jimp/plugin-color" "^0.8.2"
-    "@jimp/plugin-contain" "^0.8.2"
-    "@jimp/plugin-cover" "^0.8.2"
-    "@jimp/plugin-crop" "^0.8.2"
-    "@jimp/plugin-displace" "^0.8.2"
-    "@jimp/plugin-dither" "^0.8.2"
-    "@jimp/plugin-flip" "^0.8.2"
-    "@jimp/plugin-gaussian" "^0.8.2"
-    "@jimp/plugin-invert" "^0.8.2"
-    "@jimp/plugin-mask" "^0.8.2"
-    "@jimp/plugin-normalize" "^0.8.2"
-    "@jimp/plugin-print" "^0.8.2"
-    "@jimp/plugin-resize" "^0.8.2"
-    "@jimp/plugin-rotate" "^0.8.2"
-    "@jimp/plugin-scale" "^0.8.2"
+    "@jimp/plugin-blit" "^0.8.3"
+    "@jimp/plugin-blur" "^0.8.3"
+    "@jimp/plugin-color" "^0.8.3"
+    "@jimp/plugin-contain" "^0.8.3"
+    "@jimp/plugin-cover" "^0.8.3"
+    "@jimp/plugin-crop" "^0.8.3"
+    "@jimp/plugin-displace" "^0.8.3"
+    "@jimp/plugin-dither" "^0.8.3"
+    "@jimp/plugin-flip" "^0.8.3"
+    "@jimp/plugin-gaussian" "^0.8.3"
+    "@jimp/plugin-invert" "^0.8.3"
+    "@jimp/plugin-mask" "^0.8.3"
+    "@jimp/plugin-normalize" "^0.8.3"
+    "@jimp/plugin-print" "^0.8.3"
+    "@jimp/plugin-resize" "^0.8.3"
+    "@jimp/plugin-rotate" "^0.8.3"
+    "@jimp/plugin-scale" "^0.8.3"
     core-js "^2.5.7"
     timm "^1.6.1"
 
-"@jimp/png@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.8.2.tgz#6e4993615459a1d6f95e346797e89377b244ba50"
-  integrity sha512-q0zUndWpzLBe5XmZQnlbW5SWh9Ygb8GYz+1I69K1r3cSVn58iPMWqchIqdBZPnsHP+NyJ1oWXTSZSBr+K1Zf9Q==
+"@jimp/png@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.8.3.tgz#f8c47aee964e78a136a21d0fa73de95434536128"
+  integrity sha512-D+3yVy0qj9lmaMZ0f7zeZx+p3b76X/l12Qm/OtuWJ6n/7DhjU9JVGjyY/zE3XJY9zx3wQ2BnPEs9CkUAOV/WaQ==
   dependencies:
-    "@jimp/utils" "^0.8.2"
+    "@jimp/utils" "^0.8.3"
     core-js "^2.5.7"
     pngjs "^3.3.3"
 
-"@jimp/tiff@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.8.2.tgz#8244ec705d8cd8f48d95064c109e190d1567296e"
-  integrity sha512-xd53+1Uf7xOOrySW/aYpYaaJ2qEgojazGOv43BXlkqTmiXdWKqJr+ZlmyYI8g3wTdMyA8gscCSxxxX3LNCXMmw==
+"@jimp/tiff@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.8.3.tgz#7782531e915c0cfd0b792a9eaa1a85dfce6ab03d"
+  integrity sha512-Lq7mtPC/Gl/VXzvCgrnZjb5Rk38FO+Mf8+IKKa+NryjeuwUNfAuHI7/b59LYzEt6WM0XkhRovLVoJho13TH0ug==
   dependencies:
     core-js "^2.5.7"
     utif "^2.0.1"
 
-"@jimp/types@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.8.2.tgz#83fcad6301e1c3f0b4be8b53413f74e4d25b37bc"
-  integrity sha512-KYaMs1tWADrpII7LUQ+3fWo8+WZLg+XcHeRvsccTT81CruM4sQB55PIq9P6qWHPHsHMGM9G/4m1KrrOWkW1YMg==
+"@jimp/types@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.8.3.tgz#57b6a638196f9e23a5e35b777b48fd9076308f70"
+  integrity sha512-9tPlQhn6ECMZSecG1jAIc27TmhtyhFrWz9q7P2vF384CRDcpYe2/QDJ7KKD2TyWBvy0Ope9k1AWG/jeWkSZ+sw==
   dependencies:
-    "@jimp/bmp" "^0.8.2"
-    "@jimp/gif" "^0.8.2"
-    "@jimp/jpeg" "^0.8.2"
-    "@jimp/png" "^0.8.2"
-    "@jimp/tiff" "^0.8.2"
+    "@jimp/bmp" "^0.8.3"
+    "@jimp/gif" "^0.8.3"
+    "@jimp/jpeg" "^0.8.3"
+    "@jimp/png" "^0.8.3"
+    "@jimp/tiff" "^0.8.3"
     core-js "^2.5.7"
     timm "^1.6.1"
 
-"@jimp/utils@^0.8.2":
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.8.2.tgz#82dd4da799aad7227ef5b2ca632a36c5903d688e"
-  integrity sha512-N9XhO2FZ2Z9HG43dsJGNoZHzBQ3Ry9iPlo2Z6lJtIbFDRPfrq2/I+J+Y1Y20inUFgf9can8jOCipFnm+zMQrkg==
+"@jimp/utils@^0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.8.3.tgz#642e37e7945e7a110ea3255ddc6f72a86140290b"
+  integrity sha512-u/oqyluHHA6KQQR4z9NgX9tTJusNhR3fUwRXGy949uiC3PkhleaN8JmRUMnnBw3ENlrGz4+sAPNhJwyXgsgalA==
   dependencies:
     core-js "^2.5.7"
 
@@ -932,10 +932,10 @@ electron-rebuild@^1.8.6:
     spawn-rx "^3.0.0"
     yargs "^13.2.4"
 
-electron@^6.0.0:
-  version "6.0.9"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.9.tgz#fea15e9fec329248db500b33ba6544a26fe025a3"
-  integrity sha512-lFpSmDNyjpvJFwEnK897Soone3DV7D3ASFUb315H2VTVZSbKib9Kbrsovxf4c+e1q5hTdaONsGIm3Lb4CXIW1g==
+electron@^6.0.10:
+  version "6.0.10"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-6.0.10.tgz#3468547640c98ed46060711ca70f43d0b2e40818"
+  integrity sha512-eTFm6uTn7NKZE1OtSZSOxNuOrCXXeUR0U3vdF3R00byB7mrNe5AOaXEDDMwtzRGGY1jMuUX9Z7RvgXaCXRYSmw==
   dependencies:
     "@types/node" "^10.12.18"
     electron-download "^4.1.0"
@@ -1521,14 +1521,14 @@ itunes-nowplaying-mac@kPherox/itunes-nowplaying-mac#get-artworks-base64:
   version "0.2.3"
   resolved "https://codeload.github.com/kPherox/itunes-nowplaying-mac/tar.gz/138ba9851e8fef2cd0015a42637d6203e64fde4e"
 
-jimp@^0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.8.2.tgz#fe2a6ebb20209c557f0f25f4921872b859a326ff"
-  integrity sha512-LhyVLCf4UDMbuWdJ7UV8RfkktNUdEioJYemD1w4BrtbeE1BZYQ+E2gYNtejpmILfs/xFtrGA56p+9W6J4clfug==
+jimp@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.8.3.tgz#9c6315ab9d5fab32774dbd3f58c422553f65bd03"
+  integrity sha512-kE61YoyQJb489z/XPPU5UsG7npZeKcyAoIShn8te7cAXvMW73OX4PB1Ohj8HpFuxNkUW7uSRiJtrRTq/nJSBkg==
   dependencies:
-    "@jimp/custom" "^0.8.2"
-    "@jimp/plugins" "^0.8.2"
-    "@jimp/types" "^0.8.2"
+    "@jimp/custom" "^0.8.3"
+    "@jimp/plugins" "^0.8.3"
+    "@jimp/types" "^0.8.3"
     core-js "^2.5.7"
     regenerator-runtime "^0.13.3"
 
@@ -2700,10 +2700,10 @@ supports-color@^5.3.0:
   dependencies:
     has-flag "^3.0.0"
 
-sweetalert2@^8.13.0:
-  version "8.17.3"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-8.17.3.tgz#82aeeb255bbf3973f8ed712e9a30fbd28f73af5e"
-  integrity sha512-kXim4OTEmYXmmnVbAumoYdftsHwU0hbAJLef7WRreTXe0tLSKKd5ODMrHqLyVZfouqEBxh123Z0N4CaqRAENsg==
+sweetalert2@^8.17.6:
+  version "8.17.6"
+  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-8.17.6.tgz#80ae892cced06cfb03e6152bfa78e238c24db9be"
+  integrity sha512-5V/zlNr/WXOW+Hmu2Sn0tCzd2+FvjVZv99i0gNYN7dk31VSPYM9mNuF5QUz5OVq49yYMpOV+F2Qslup8nnm4MQ==
 
 tar@^4.4.8:
   version "4.4.11"