Back to the #3813 (#3949)

* Revert "Revert "Resolve #3813 (#3814)""

This reverts commit f433182c4c.

* Keep CW is back

* New Wave

https://github.com/syuilo/misskey/pull/3949#pullrequestreview-194787210

src/client/app/desktop/views/components/post-form.vue

@@ -222,6 +222,12 @@ export default Vue.extend({
 			});
 		}
 
+		// keep cw when reply
+		if (this.$store.state.settings.keepCw && this.reply && this.reply.cw) {
+			this.useCw = true;
+			this.cw = this.reply.cw;
+		}
+
 		this.$nextTick(() => {
 			// 書きかけの投稿を復元
 			if (!this.instant && !this.mention) {

src/client/app/desktop/views/components/settings.vue

@@ -31,7 +31,12 @@
 				<ui-switch v-model="autoPopout">{{ $t('auto-popout') }}
 					<span slot="desc">{{ $t('auto-popout-desc') }}</span>
 				</ui-switch>
-				<ui-switch v-model="deckNav">{{ $t('deck-nav') }}<span slot="desc">{{ $t('deck-nav-desc') }}</span></ui-switch>
+				<ui-switch v-model="deckNav">{{ $t('deck-nav') }}
+					<span slot="desc">{{ $t('deck-nav-desc') }}</span>
+				</ui-switch>
+				<ui-switch v-model="keepCw">{{ $t('keep-cw') }}
+					<span slot="desc">{{ $t('keep-cw-desc') }}</span>
+				</ui-switch>
 			</section>
 
 			<section>
@@ -336,6 +341,11 @@ export default Vue.extend({
 			set(value) { this.$store.commit('settings/set', { key: 'deckNav', value }); }
 		},
 
+		keepCw: {
+			get() { return this.$store.state.settings.keepCw; },
+			set(value) { this.$store.commit('settings/set', { key: 'keepCw', value }); }
+		},
+
 		darkmode: {
 			get() { return this.$store.state.device.darkmode; },
 			set(value) { this.$store.commit('device/set', { key: 'darkmode', value }); }