Merge branch 'master' into dependabot/npm_and_yarn/app/electron-rebuild-2.3.2

2020-11-17 02:11:33 +09:00 · 2020-11-17 02:11:33 +09:00 · 64296c69d3
commit 64296c69d3
parent 1a35eda46f f4d250eeb3
22 changed files with 325 additions and 142 deletions
--- a/app/css/master.css
+++ b/app/css/master.css
@ -21,7 +21,8 @@ html {
 .action-menu-item:hover {
 	filter: brightness(80%) !important;
 }
-.btn, .btn-flat {
+.btn,
+.btn-flat {
 	font-size: 1.1rem;
 	margin: 0.4rem;
 	text-transform: none;
@ -340,16 +341,16 @@ blockquote:before,
 	flex-wrap: wrap;
 	flex-direction: column;
 }
-input[type="color"] {
+input[type='color'] {
 	-webkit-appearance: none;
 	border: none;
 	width: 32px;
 	height: 32px;
 }
-input[type="color"]::-webkit-color-swatch-wrapper {
+input[type='color']::-webkit-color-swatch-wrapper {
 	padding: 0;
 }
-input[type="color"]::-webkit-color-swatch {
+input[type='color']::-webkit-color-swatch {
 	border: none;
 }
 #menu {
@ -634,3 +635,21 @@ button {
 	white-space: nowrap;
 	overflow-x: hidden;
 }
+#re-online {
+	background-color: rgb(38, 92, 153);
+	position: fixed;
+	width: 100vw;
+	height: 2rem;
+	padding: 0.25rem;
+	color: white;
+	z-index: 1000;
+}
+#offline {
+	background-color: rgb(153, 38, 38);
+	position: fixed;
+	width: 100vw;
+	height: 2rem;
+	padding: 0.25rem;
+	color: white;
+	z-index: 999;
+}
--- a/app/css/post.css
+++ b/app/css/post.css
@ -64,9 +64,10 @@ textarea {
 }
 #emoji {
 }
-#suggest {
+#suggest, #draft {
 	max-height: 23rem;
 	overflow-y: scroll;
+	overflow-x: hidden;
 }
 #emoji-list {
 	width: 100%;
--- a/app/js/common/keyshortcut.js
+++ b/app/js/common/keyshortcut.js
@ -227,7 +227,8 @@ $(function($) {
 				var acct_id = $('#timeline_' + selectedColumn).attr('data-acct')
 				var ats_cm = $('.selectedToot .rep-btn').attr('data-men')
 				var mode = $('.selectedToot .rep-btn').attr('data-visen')
-				re(id, ats_cm, acct_id, mode)
+				var cwTxt = $('#cw-text').val()
+				re(id, ats_cm, acct_id, mode, cwTxt)
 				return false
 			}
 		}
--- a/app/js/platform/end.js
+++ b/app/js/platform/end.js
@ -219,9 +219,11 @@ if(pwa) {
 const connection = function (event) {
 	console.log(navigator.onLine, 'network state')
 	if(!navigator.onLine) {
-		$('#toot-post-btn').addClass('disabled')
-	} else {
-		$('#toot-post-btn').removeClass('disabled')
+		$('#re-online').addClass('hide')
+		$('#offline').removeClass('hide')
+	} else if(!$('#offline').hasClass('hide')) {
+		$('#offline').addClass('hide')
+		$('#re-online').removeClass('hide')
 	}
 }
 window.onoffline = connection
--- a/app/js/post/emoji.js
+++ b/app/js/post/emoji.js
@ -23,6 +23,7 @@ function emojiToggle(reaction) {
 		}
 		$('#post-box').css('width', width + 'px')
 		$('#suggest').html('')
+		$('#draft').html('')
 		if (!localStorage.getItem('emojis_' + acct_id)) {
 			var html = `<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="emojiGet('true');">${lang.lang_emoji_get}</button>`
 			$('#emoji-list').html(html)
@ -31,10 +32,12 @@ function emojiToggle(reaction) {
 		}
 	} else {
 		$('#poll').addClass('hide')
+		$('#draft').addClass('hide')
 		$('#right-side').hide()
 		$('#right-side').css('width', '300px')
 		$('#emoji').addClass('hide')
 		$('#suggest').html('')
+		$('#draft').html('')
 		$('#left-side').css('width', '100%')
 		var width = localStorage.getItem('postbox-width')
 		if (width) {
--- a/app/js/post/post.js
+++ b/app/js/post/post.js
@ -9,7 +9,16 @@ function sec() {
 	}
 	post(null, mode)
 }
-function post(mode, postvis) {
+function post(mode, postvis, dry) {
+	if(!navigator.onLine && !dry) {
+		draftToggle(true)
+		addToDraft()
+		M.toast({
+			html: lang.lang_post_offline,
+			displayLength: 3000
+		})
+		return false
+	}
 	if ($('#toot-post-btn').prop('disabled')) {
 		return false
 	}
@ -159,6 +168,13 @@ function post(mode, postvis) {
 		}
 	}
 	console.table(toot)
+	if (dry) {
+		$('#ideKey').val('')
+		$('.toot-btn-group').prop('disabled', false)
+		todc()
+		toot['TheDeskAcctId'] = acct_id
+		return toot
+	}
 	var httpreq = new XMLHttpRequest()
 	httpreq.open('POST', start, true)
 	httpreq.setRequestHeader('Content-Type', 'application/json')
--- a/app/js/post/secure.js
+++ b/app/js/post/secure.js
@ -79,8 +79,8 @@ function loadVis() {
 loadVis()

 //コンテントワーニング
-function cw() {
-	if ($('#cw').hasClass('cw-avail')) {
+function cw(force) {
+	if ($('#cw').hasClass('cw-avail') || !force) {
 		$('#cw-text').val()
 		$('#cw-text').hide()
 		$('#cw').removeClass('yellow-text')
@ -126,3 +126,79 @@ function schedule() {
 		$('#sch-box').addClass('sch-avail')
 	}
 }
+
+//下書き機能
+function draftToggle(force) {
+	if ($('#draft').hasClass('hide') || force) {
+		$('#draft').removeClass('hide')
+		$('#right-side').show()
+		$('#right-side').css('width', '300px')
+		$('#left-side').css('width', 'calc(100% - 300px)')
+		var width = localStorage.getItem('postbox-width')
+		if (width) {
+			width = width.replace('px', '') * 1 + 300
+		} else {
+			width = 600
+		}
+		$('#post-box').css('width', width + 'px')
+		$('#suggest').html('')
+		$('#draft').html('')
+		draftDraw()
+	} else {
+		$('#poll').addClass('hide')
+		$('#draft').addClass('hide')
+		$('#right-side').hide()
+		$('#right-side').css('width', '300px')
+		$('#emoji').addClass('hide')
+		$('#suggest').html('')
+		$('#draft').html('')
+		$('#left-side').css('width', '100%')
+		var width = localStorage.getItem('postbox-width')
+		if (width) {
+			width = width.replace('px', '') * 1
+		} else {
+			width = 300
+		}
+		$('#post-box').css('width', width + 'px')
+	}
+}
+function draftDraw() {
+	var draft = localStorage.getItem('draft')
+	var html = `<button class="btn waves-effect green" style="width:100%; padding:0; margin-top:0;" onclick="addToDraft();">${lang.lang_secure_draft}</button>`
+	if (draft) {
+		var draftObj = JSON.parse(draft)
+		for (let i = 0; i < draftObj.length; i++) {
+			var toot = draftObj[i]
+			html = html + `<div class="tootInDraft">
+				<i class="waves-effect gray material-icons" onclick="useThisDraft(${i})" title="${lang.lang_secure_userThis}">reply</i>
+				<i class="waves-effect gray material-icons" onclick="deleteThisDraft(${i})" title="${lang.lang_secure_deleteThis}">cancel</i>
+				${escapeHTML(toot.status).replace(/\n/, '').substr(0, 10)}
+			</div>`
+		}
+	}
+	$('#draft').html(html)
+}
+function addToDraft() {
+	var json = post(null, null, true)
+	var draft = localStorage.getItem('draft')
+	var draftObj = []
+	if (draft) draftObj = JSON.parse(draft)
+	draftObj.push(json)
+	draft = JSON.stringify(draftObj)
+	localStorage.setItem('draft', draft)
+	draftDraw()
+}
+function useThisDraft(i) {
+	var draft = localStorage.getItem('draft')
+	var draftObj = JSON.parse(draft)
+	draftToPost(draftObj[i], draftObj[i]['TheDeskAcctId'], 0)
+	draftToggle()
+}
+function deleteThisDraft(i) {
+	var draft = localStorage.getItem('draft')
+	var draftObj = JSON.parse(draft)
+	draftObj.splice(i, 1)
+	draft = JSON.stringify(draftObj)
+	localStorage.setItem('draft', draft)
+	draftDraw()
+}
--- a/app/js/post/status.js
+++ b/app/js/post/status.js
@ -426,12 +426,20 @@ function redraft(id, acct_id) {
 						setLog(start, this.status, this.response)
 					}
 					var json = httpreq.response
+					draftToPost(json, acct_id, id)
+				}
+			}
+		}
+	})
+}
+function draftToPost(json, acct_id, id) {
 	$('#post-acct-sel').prop('disabled', true)
 	$('#post-acct-sel').val(acct_id)
 	$('select').formSelect()
 	mdCheck()
 	var medias = $('[toot-id=' + id + ']').attr('data-medias')
-					var mediack = json.media_attachments[0]
+	mediack = null
+	if(json.media_attachments) mediack = json.media_attachments[0]
 	//メディアがあれば
 	var media_ids = []
 	if (mediack) {
@ -448,16 +456,16 @@ function redraft(id, acct_id) {
 			}
 		}
 	}
-					var vismode = $('[toot-id=' + id + '] .vis-data').attr('data-vis')
+	var vismode = json.visibility
 	vis(vismode)
-					var medias = media_ids.join(',');
+	var medias = media_ids.join(',')
 	$('#media').val(medias)
 	localStorage.setItem('nohide', true)
 	show()
 	if (json.text) {
 		var html = json.text
 	} else {
-						var html = $('[toot-id=' + id + '] .toot').html()
+		var html = json.status
 		html = html.replace(/^<p>(.+)<\/p>$/, '$1')
 		html = html.replace(/<br\s?\/?>/, '\n')
 		html = html.replace(/<p>/, '\n')
@ -467,7 +475,7 @@ function redraft(id, acct_id) {
 	}
 	$('#textarea').val(html)
 	if (json.spoiler_text) {
-						cw()
+		cw(true)
 		$('#cw-text').val(json.spoiler_text)
 	}
 	if (json.sensitive) {
@ -479,10 +487,6 @@ function redraft(id, acct_id) {
 		$('#reply').val(json.in_reply_to_id)
 	}
 }
-			}
-		}
-	})
-}
 //ピン留め
 function pin(id, acct_id) {
 	if ($(`.cvo[unique-id=${id}]`).hasClass('pined')) {
--- a/app/js/post/suggest.js
+++ b/app/js/post/suggest.js
@ -18,7 +18,7 @@ input.addEventListener(
 			var new_val = input.value
 			if (new_val == '') {
 				$('#suggest').html('')
-				if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+				if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
 					$('#right-side').hide()
 					$('#right-side').css('width', '300px')
 					$('#left-side').css('width', '100%')
@ -41,7 +41,7 @@ input.addEventListener(
 					var q = acct[1]
 				} else {
 					$('#suggest').html('')
-					if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+					if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
 						$('#right-side').hide()
 						$('#right-side').css('width', '300px')
 						$('#left-side').css('width', '100%')
@ -138,6 +138,7 @@ input.addEventListener(
 									$('#post-box').css('width', width + 'px')
 									$('#poll').addClass('hide')
 									$('#emoji').addClass('hide')
+									$('#draft').addClass('hide')
 								}
 							} else if (json.accounts[0] && acct[1]) {
 								var accts = ''
@ -165,8 +166,9 @@ input.addEventListener(
 								$('#suggest').html(accts)
 								$('#poll').addClass('hide')
 								$('#emoji').addClass('hide')
+								$('#draft').addClass('hide')
 							} else {
-								if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+								if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
 									$('#right-side').hide()
 									$('#right-side').css('width', '300px')
 									$('#left-side').css('width', '100%')
@ -226,7 +228,7 @@ function tagInsert(code, del) {
 	}
 	sentence = before + word + after
 	textarea.value = sentence
-	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide')) {
+	if ($('#poll').hasClass('hide') && $('#emoji').hasClass('hide') && $('#draft').hasClass('hide')) {
 		$('#right-side').hide()
 		$('#right-side').css('width', '300px')
 		$('#left-side').css('width', '50%')
--- a/app/js/post/use-txtbox.js
+++ b/app/js/post/use-txtbox.js
@ -1,5 +1,5 @@
 /*リプライ*/
-function re(id, ats_cm, acct_id, mode) {
+function re(id, ats_cm, acct_id, mode, cwTxt) {
 	clear()
 	var ats = ats_cm.split(',')
 	localStorage.setItem('nohide', true)
@ -25,13 +25,18 @@ function re(id, ats_cm, acct_id, mode) {
 	}
 	$('#acct-sel-prof').attr('src', profimg)
 	vis(mode)
+	if(localStorage.getItem('cw-continue') == 'yes') {
+		cw(true)
+		$('#cw-text').val(cwTxt)
+	}
 }
 function reEx(id) {
 	$('#tootmodal').modal('close')
 	var at = $('#tootmodal').attr('data-user')
 	var acct_id = $('#status-acct-sel').val()
 	var mode = $('#tootmodal .vis-data').attr('data-vis')
-	re(id, at, acct_id, mode)
+	var cwTxt = $('#cw-text').val()
+	re(id, at, acct_id, mode, cwTxt)
 }
 //引用
 function qt(id, acct_id, at, url) {
--- a/app/js/tl/parse.js
+++ b/app/js/tl/parse.js
@ -1085,7 +1085,7 @@ function parse(obj, mix, acct_id, tlid, popup, mutefilter, type) {
 						</a>
 					</div>
 					<div class="action ${disp['re']} ${noauth}">
-						<a onclick="re('${toot.id}','${to_mention}','${acct_id}','${visen}')" 
+						<a onclick="re('${toot.id}','${to_mention}','${acct_id}','${visen}','${escapeHTML(toot.spoiler_text)}')" 
 							class="waves-effect waves-dark btn-flat actct rep-btn"
 							data-men="${to_mention}" data-visen="${visen}" style="padding:0" title="${lang.lang_parse_replyto}">
 								<i class="fas fa-share"></i>
--- a/app/js/tl/poll.js
+++ b/app/js/tl/poll.js
@ -25,6 +25,7 @@ function pollToggle() {
 		}
 		$('#post-box').css('width', width + 'px')
 		$('#emoji').addClass('hide')
+		$('#draft').addClass('hide')
 		$('#poll').addClass('hide')
 		$('#pollsta').text(lang.lang_no)
 	}
--- a/app/package.json
+++ b/app/package.json
@ -1,6 +1,6 @@
 {
    "name": "thedesk",
-    "version": "21.2.4",
+    "version": "21.3.0",
    "codename": "Mayu",
    "description": "TheDesk is a Mastodon client for PC.",
    "repository": "https://github.com/cutls/TheDesk",
@ -68,7 +68,7 @@
        "lodash": "^4.17.20",
        "materialize-css": "git://github.com/cutls/materialize#v1-dev",
        "sumchecker": "^3.0.1",
-        "sweetalert2": "^10.3.5",
+        "sweetalert2": "^10.10.0",
        "system-font-families": "^0.4.1",
        "vue": "^2.6.12"
    },
@ -77,10 +77,10 @@
    },
    "devDependencies": {
        "chokidar": "^3.4.2",
-        "electron": "^10.1.2",
+        "electron": "^10.1.5",
        "electron-builder": "^22.8.1",
        "electron-rebuild": "^2.3.2",
-        "eslint": "^7.9.0",
+        "eslint": "^7.13.0",
        "readline-sync": "1.4.10"
    },
    "build": {
--- a/app/view/make/index.sample.html
+++ b/app/view/make/index.sample.html
@ -43,6 +43,12 @@
 			<i class="material-icons">chat</i>
 		</button>
 	</div>
+	<div id="offline" class="hide">
+		@@nowOffline@@
+	</div>
+	<div id="re-online" class="hide">
+		@@reOnline@@
+	</div>
 	<div id="tl">
 		<!--TL-->
 		<!--スターター-->
@ -278,6 +284,9 @@
 					<li>
 						<a onclick="pollToggle();">@@poll@@</a>
 					</li>
+					<li>
+						<a onclick="draftToggle();">@@draft@@</a>
+					</li>
 				</ul>
 				<!--hidden area-->
 				<input type="hidden" id="reply" />
@ -297,6 +306,7 @@
 		</div>
 		<div id="right-side">
 			<div id="suggest" class="right-side-content"></div>
+			<div id="draft" class="hide right-side-content"></div>
 			<!--絵文字ピッカー-->
 			<div id="emoji" class="hide right-side-content">
 				<span class="gray sml">@@emojiWarn@@
@ -765,7 +775,7 @@
 			<a href="https://thedesk.top" target="_blank">HP</a><br />
 			<a href="https://github.com/cutls/TheDesk" target="_blank">GitHub</a><br />
 			<br />
-			<div id="release-21-2-4_Mayu" class="release-do" style="display:none; ">
+			<div id="release-21-3-0_Mayu" class="release-do" style="display:none; ">
 				<br />
 				<a href="https://ja.mstdn.
 				wiki/TheDesk" target="_blank">機能一覧</a><br />
@ -774,9 +784,10 @@
 				困ったときは、<a href="https://docs.thedesk.top">TheDesk Docs</a>をご覧ください。
 				<h5>Release Note 21.2.4 (Mayu)</h5>
 				<!--上のdivのidも変えてね-->
-				・Tipsのデザイン修正/メモリ表示時に稼働時間を表示  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・タイムラインでカラムの挿入場所がズレたり、挿入されなかったりするバグ  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
-・イタリア語を追加  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
+				・プロフィールのデザイン改善  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a> <a onclick="udgEx('Zergling_man@openweb.social','main')" class="contributor"><img src="https://user-images.githubusercontent.com/17561618/99282891-a470b080-2877-11eb-8b6c-66457e1a9643.png">zergling-man</a><br>
+・下書き機能の追加  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
+・リプライ時のCWの挙動を設定で変更可能に  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>
+・オフライン時の挙動を変更。下書き機能を活用。  <a onclick="udgEx('Cutls@cutls.com','main')" class="contributor"><img src="https://media.thedesk.top/accounts/avatars/000/000/001/original/d34ef8bb49d5e011.png">cutls</a><br>

 			</div>
 			<div id="release-en" style="display:none">
--- a/app/view/make/language/en/index.json
+++ b/app/view/make/language/en/index.json
@ -1,5 +1,7 @@
 {
    "draghere":"Drag here to upload",
+    "nowOffline":"OFFLINE: all of your post is in the draft box and you should reload after re-connect to the Internet",
+    "reOnline":"Now we are in the Internet, you should reload...",
    "close":"Close",
    "webSrc": "Search on Web",
    "tsSrc": "Search on tootsearch",
@ -45,6 +47,7 @@
    "thingsEmoji":"Emojis of tools",
    "symbolEmoji":"Emojis of symbols",
    "flagsEmoji":"Emojis of flags",
+    "draft": "Draft",
    "poll":"Poll",
    "pollDdisabled":"Polls: Disabled",
    "pollProvider":"Provider of Poll",
--- a/app/view/make/language/en/main.json
+++ b/app/view/make/language/en/main.json
@ -71,6 +71,7 @@
    "lang_post_btn3": "Continue to post",
    "lang_post_unfinishedMedia": "The server has not finished processing your media. Retry.",
    "lang_post_retry": "Retry",
+    "lang_post_offline": "Add to the drafts because of offline",
    "lang_status_favWarn": "It will take a miunte to favourite a remote toot.",
    "lang_status_btWarn": "It will take a miunte to boost a remote toot.",
    "lang_status_follow": "Follow",
@ -87,6 +88,9 @@
    "lang_status_endorse": "Feature on profile",
    "lang_status_followers": "Followers",
    "lang_status_active": "Last status",
+    "lang_secure_draft": "Add to draft",
+    "lang_secure_useThis": "Use this",
+    "lang_secure_deleteThis": "Delete this",
    "lang_suggest_nodata": "Please get emojis list in order to show suggestion.",
    "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.",
    "lang_cards_check": " check",
--- a/app/view/make/language/ja-KS/index.json
+++ b/app/view/make/language/ja-KS/index.json
@ -1,5 +1,7 @@
 {
    "draghere":"ドラッグしてみ？(ドラッグしたらすぐアップロードされるで)",
+    "nowOffline":"オフラインやで。投稿は全部下書きに行くし、もしオンラインなったら再読み込みしたらええで。",
+    "reOnline":"オンライン戻ったから再読み込みしてな。",
    "close":"Close",
    "webSrc": "Webでさがす",
    "tsSrc": "tootsearchでさがす",
@ -43,6 +45,7 @@
    "thingsEmoji":"もの",
    "symbolEmoji":"記号",
    "flagsEmoji":"国旗",
+    "draft": "下書き(タンス)",
    "poll":"アンケート",
    "pollDdisabled":"アンケート付けへん",
    "pollProvider":"アンケートのプロバイダ",
--- a/app/view/make/language/ja-KS/main.json
+++ b/app/view/make/language/ja-KS/main.json
@ -72,6 +72,7 @@
    "lang_status_btWarn": "ブーストしたんやけどインスタンスがちゃうときは時間がかかるで、知らんけど。",
    "lang_post_unfinishedMedia": "処理未了のメディアがあります。再試行してください。",
    "lang_post_retry": "再試行",
+    "lang_post_offline": "オフラインやったし下書きいれといたで",
    "lang_status_follow": "フォロー",
    "lang_status_unfollow": "フォロー解除",
    "lang_status_block": "ブロック",
@ -86,6 +87,9 @@
    "lang_status_endorse": "プロフで紹介する",
    "lang_status_followers": "フォロワー",
    "lang_status_active": "最新トゥート",
+    "lang_secure_draft": "タンスになおす",
+    "lang_secure_useThis": "使う",
+    "lang_secure_deleteThis": "ほかす",
    "lang_suggest_nodata": "サジェストしたいんやけど、絵文字リストを取得してくれへん？",
    "lang_usetxtbox_reply": "返信モードや。やめるときはCtrl+Shift+Cな。",
    "lang_cards_check": "チェック",
--- a/app/view/make/language/ja/index.json
+++ b/app/view/make/language/ja/index.json
@ -1,5 +1,7 @@
 {
    "draghere":"ここにドラッグして添付(ドラッグと同時にアップロードされます)",
+    "nowOffline":"オフラインです。投稿はすべて下書きに追加されます。オンライン復帰時には再読み込みを推奨します。",
+    "reOnline": "オンラインに復帰しました。再読み込みを推奨します。",
    "webSrc": "Webで検索",
    "tsSrc": "tootsearchで検索",
    "close":"Close",
@ -45,6 +47,7 @@
    "thingsEmoji":"もの",
    "symbolEmoji":"記号",
    "flagsEmoji":"国旗",
+    "draft": "下書き",
    "poll":"アンケート",
    "pollDdisabled":"アンケートを使用しない",
    "pollProvider":"アンケートのプロバイダ",
--- a/app/view/make/language/ja/main.json
+++ b/app/view/make/language/ja/main.json
@ -72,6 +72,7 @@
    "lang_post_btn3": "そのまま投稿",
    "lang_post_unfinishedMedia": "処理未了のメディアがあります。再試行してください。",
    "lang_post_retry": "再試行",
+    "lang_post_offline": "オフラインのため下書きに追加しました。",
    "lang_status_favWarn": "お気に入り登録しました。インスタンスが違うときは時間がかかる場合があります。",
    "lang_status_btWarn": "ブーストしました。インスタンスが違うときは時間がかかる場合があります。",
    "lang_status_follow": "フォロー",
@ -88,6 +89,9 @@
    "lang_status_endorse": "プロフで紹介する",
    "lang_status_followers": "フォロワー",
    "lang_status_active": "最新トゥート",
+    "lang_secure_draft": "下書きに追加",
+    "lang_secure_useThis": "使う",
+    "lang_secure_deleteThis": "削除",
    "lang_suggest_nodata": "サジェストのために絵文字リストを取得してください。",
    "lang_usetxtbox_reply": "返信モードです。クリアするときはCtrl+Shift+Cを押してください。",
    "lang_cards_check": "チェック",
--- a/app/view/make/setting.sample.js
+++ b/app/view/make/setting.sample.js
@ -523,6 +523,17 @@ var postConstruction = [
 			checkbox: yesno
 		}
 	},
+	{
+		id: 'cw-continue',
+		storage: 'cw-continue',
+		checkbox: true,
+		setValue: 'no',
+		text: {
+			head: '@@cwContinue@@',
+			desc: '',
+			checkbox: yesno
+		}
+	},
 	{
 		id: 'vis',
 		storage: 'vis',
--- a/app/yarn.lock
+++ b/app/yarn.lock
@ -58,10 +58,10 @@
    global-agent "^2.0.2"
    global-tunnel-ng "^2.7.1"

-"@eslint/eslintrc@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085"
-  integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA==
+"@eslint/eslintrc@^0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c"
+  integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==
  dependencies:
    ajv "^6.12.4"
    debug "^4.1.1"
@ -1280,10 +1280,10 @@ electron-rebuild@^2.3.2:
    tar "^6.0.5"
    yargs "^16.0.0"

-electron@^10.1.2:
-  version "10.1.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.2.tgz#30b6fd7669f8daf08c56219a61dfa053fa2b0c70"
-  integrity sha512-SvN8DcKCmPZ0UcQSNAJBfaUu+LGACqtRhUn1rW0UBLHgdbbDM76L0GU5/XGQEllH5pu5bwlCZwax3srzIl+Aeg==
+electron@^10.1.5:
+  version "10.1.5"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-10.1.5.tgz#f2b161310f627063e73fbac44efcb35dece83a90"
+  integrity sha512-fys/KnEfJq05TtMij+lFvLuKkuVH030CHYx03iZrW5DNNLwjE6cW3pysJ420lB0FRSfPjTHBMu2eVCf5TG71zQ==
  dependencies:
    "@electron/get" "^1.0.1"
    "@types/node" "^12.0.12"
@ -1373,12 +1373,12 @@ escape-string-regexp@^2.0.0:
  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==

-eslint-scope@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5"
-  integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==
+eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
  dependencies:
-    esrecurse "^4.1.0"
+    esrecurse "^4.3.0"
    estraverse "^4.1.1"

 eslint-utils@^2.1.0:
@ -1393,22 +1393,27 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==

-eslint@^7.9.0:
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.9.0.tgz#522aeccc5c3a19017cf0cb46ebfd660a79acf337"
-  integrity sha512-V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA==
+eslint-visitor-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+
+eslint@^7.13.0:
+  version "7.13.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da"
+  integrity sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==
  dependencies:
    "@babel/code-frame" "^7.0.0"
-    "@eslint/eslintrc" "^0.1.3"
+    "@eslint/eslintrc" "^0.2.1"
    ajv "^6.10.0"
    chalk "^4.0.0"
    cross-spawn "^7.0.2"
    debug "^4.0.1"
    doctrine "^3.0.0"
    enquirer "^2.3.5"
-    eslint-scope "^5.1.0"
+    eslint-scope "^5.1.1"
    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^1.3.0"
+    eslint-visitor-keys "^2.0.0"
    espree "^7.3.0"
    esquery "^1.2.0"
    esutils "^2.0.2"
@ -1457,14 +1462,14 @@ esquery@^1.2.0:
  dependencies:
    estraverse "^5.1.0"

-esrecurse@^4.1.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
-  integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
  dependencies:
-    estraverse "^4.1.0"
+    estraverse "^5.2.0"

-estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.1:
  version "4.3.0"
  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@ -1474,6 +1479,11 @@ estraverse@^5.1.0:
  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==

+estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
 esutils@^2.0.2:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@ -3416,10 +3426,10 @@ supports-color@^7.1.0:
  dependencies:
    has-flag "^4.0.0"

-sweetalert2@^10.3.5:
-  version "10.3.5"
-  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.3.5.tgz#e5a10ad789163e85ec6031a413b08b20e5aae0a4"
-  integrity sha512-8XBQvW2frWVn0Xs80qyraRXcb3Mg/aKG+9sdVPlzViDIYJfLhMeda3pRuyGzyvrPXbBQ3KRjs+66xKH3kz8/og==
+sweetalert2@^10.10.0:
+  version "10.10.0"
+  resolved "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-10.10.0.tgz#84e8fe1c1c756059196fd89c49790d4bfb954b93"
+  integrity sha512-TnYWt1hnPw/jkK1IqPpFT4yMZGE9VsKJApzd0dcjsrE8biykeoECpIgV8DzRVvWufit/1Z2m5Zdyo2hjBfGzoQ==

 system-font-families@^0.4.1:
  version "0.4.1"