Merge branch 'develop' into feature/following_reblogs

1 files changed, 8 insertions, 4 deletions

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 4356d0a7..918065d2 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -426,9 +426,13 @@ export const mutations = {
       newStatus.favoritedBy.push(user)
     }
   },
-  setMuted (state, status) {
+  setMutedStatus (state, status) {
     const newStatus = state.allStatusesObject[status.id]
-    newStatus.muted = status.muted
+    newStatus.thread_muted = status.thread_muted
+
+    if (newStatus.thread_muted !== undefined) {
+      state.conversationsObject[newStatus.statusnet_conversation_id].forEach(status => { status.thread_muted = newStatus.thread_muted })
+    }
   },
   setRetweeted (state, { status, value }) {
     const newStatus = state.allStatusesObject[status.id]
@@ -566,11 +570,11 @@ const statuses = {
     },
     muteConversation ({ rootState, commit }, statusId) {
       return rootState.api.backendInteractor.muteConversation(statusId)
-        .then((status) => commit('setMuted', status))
+        .then((status) => commit('setMutedStatus', status))
     },
     unmuteConversation ({ rootState, commit }, statusId) {
       return rootState.api.backendInteractor.unmuteConversation(statusId)
-        .then((status) => commit('setMuted', status))
+        .then((status) => commit('setMutedStatus', status))
     },
     retweet ({ rootState, commit }, status) {
       // Optimistic retweeting...