From 31cb1a8ffff880901a1d833ce43e792259c972d2 Mon Sep 17 00:00:00 2001
From: AkiraFukushima <h3.poteto@gmail.com>
Date: Tue, 19 Jun 2018 22:44:33 +0900
Subject: [PATCH] refs #380 Set visibility from source message when reply

---
 .../components/TimelineSpace/HeaderMenu.vue   |  2 +-
 .../TimelineSpace/Modals/NewToot.vue          |  8 +++++--
 src/renderer/store/TimelineSpace.js           |  4 ++--
 .../store/TimelineSpace/Modals/NewToot.js     | 23 +++++++++++--------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/renderer/components/TimelineSpace/HeaderMenu.vue b/src/renderer/components/TimelineSpace/HeaderMenu.vue
index bee0498a..895e503b 100644
--- a/src/renderer/components/TimelineSpace/HeaderMenu.vue
+++ b/src/renderer/components/TimelineSpace/HeaderMenu.vue
@@ -70,7 +70,7 @@ export default {
       }
     },
     openNewTootModal () {
-      this.$store.commit('TimelineSpace/Modals/NewToot/changeModal', true)
+      this.$store.dispatch('TimelineSpace/Modals/NewToot/openModal')
     }
   }
 }
diff --git a/src/renderer/components/TimelineSpace/Modals/NewToot.vue b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
index 40b4de63..ed4a05d9 100644
--- a/src/renderer/components/TimelineSpace/Modals/NewToot.vue
+++ b/src/renderer/components/TimelineSpace/Modals/NewToot.vue
@@ -97,7 +97,11 @@ export default {
         return this.$store.state.TimelineSpace.Modals.NewToot.modalOpen
       },
       set (value) {
-        this.$store.dispatch('TimelineSpace/Modals/NewToot/changeModal', value)
+        if (value) {
+          this.$store.dispatch('TimelineSpace/Modals/NewToot/openModal')
+        } else {
+          this.$store.dispatch('TimelineSpace/Modals/NewToot/closeModal')
+        }
       }
     },
     status: {
@@ -136,7 +140,7 @@ export default {
   methods: {
     close () {
       this.resetImage()
-      this.$store.dispatch('TimelineSpace/Modals/NewToot/changeModal', false)
+      this.$store.dispatch('TimelineSpace/Modals/NewToot/closeModal')
     },
     toot () {
       if (!this.newTootModal) {
diff --git a/src/renderer/store/TimelineSpace.js b/src/renderer/store/TimelineSpace.js
index 6fc02cab..1a07d091 100644
--- a/src/renderer/store/TimelineSpace.js
+++ b/src/renderer/store/TimelineSpace.js
@@ -121,9 +121,9 @@ const TimelineSpace = {
       ipcRenderer.send('stop-local-streaming')
       return 'stopLocalStreaming'
     },
-    watchShortcutEvents ({ commit }) {
+    watchShortcutEvents ({ commit, dispatch }) {
       ipcRenderer.on('CmdOrCtrl+N', () => {
-        commit('TimelineSpace/Modals/NewToot/changeModal', true, { root: true })
+        dispatch('TimelineSpace/Modals/NewToot/openModal', {}, { root: true })
       })
       ipcRenderer.on('CmdOrCtrl+K', () => {
         commit('TimelineSpace/Modals/Jump/changeModal', true, { root: true })
diff --git a/src/renderer/store/TimelineSpace/Modals/NewToot.js b/src/renderer/store/TimelineSpace/Modals/NewToot.js
index df79e4e9..5de5cbb7 100644
--- a/src/renderer/store/TimelineSpace/Modals/NewToot.js
+++ b/src/renderer/store/TimelineSpace/Modals/NewToot.js
@@ -65,19 +65,22 @@ const NewToot = {
       const mentionAccounts = [message.account.acct].concat(message.mentions.map(a => a.acct))
         .filter((a, i, self) => self.indexOf(a) === i)
         .filter((a) => a !== rootState.TimelineSpace.account.username)
+      commit('changeModal', true)
       commit('updateStatus', `${mentionAccounts.map(m => `@${m}`).join(' ')} `)
+      commit('changeVisibility', message.visibility)
+    },
+    openModal ({ commit }) {
       commit('changeModal', true)
     },
-    changeModal ({ commit }, value) {
-      commit('changeModal', value)
-      if (!value) {
-        commit('updateStatus', '')
-        commit('setReplyTo', null)
-        commit('changeBlockSubmit', false)
-        commit('clearAttachedMedias')
-        commit('changeSensitive', false)
-        commit('updateSpoiler', '')
-      }
+    closeModal ({ commit }) {
+      commit('changeModal', false)
+      commit('updateStatus', '')
+      commit('setReplyTo', null)
+      commit('changeBlockSubmit', false)
+      commit('clearAttachedMedias')
+      commit('changeSensitive', false)
+      commit('updateSpoiler', '')
+      commit('changeVisibility', 'public')
     },
     uploadImage ({ state, commit, rootState }, image) {
       commit('changeBlockSubmit', true)