diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-04 21:11:13 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-04 21:11:13 +0300 |
| commit | 1a5a7bbebf45e93dbd47a99bb4eb05a5be5979f1 (patch) | |
| tree | dbac1ec5d0d69c7db57245d5d040741e0e6610cf /src/components | |
| parent | 66a34b7ecf65ded39882b9e4e7df9bbd2067afc3 (diff) | |
Set thread_muted for all statuses with the same conversation id on
status mute/unmute
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/extra_buttons/extra_buttons.vue | 4 | ||||
| -rw-r--r-- | src/components/status/status.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue index ed0f3aa4..6781a4f8 100644 --- a/src/components/extra_buttons/extra_buttons.vue +++ b/src/components/extra_buttons/extra_buttons.vue @@ -10,14 +10,14 @@ <div slot="popover"> <div class="dropdown-menu"> <button - v-if="canMute && !status.muted" + v-if="canMute && !status.thread_muted" class="dropdown-item dropdown-item-icon" @click.prevent="muteConversation" > <i class="icon-eye-off" /><span>{{ $t("status.mute_conversation") }}</span> </button> <button - v-if="canMute && status.muted" + v-if="canMute && status.thread_muted" class="dropdown-item dropdown-item-icon" @click.prevent="unmuteConversation" > diff --git a/src/components/status/status.js b/src/components/status/status.js index d037f150..b72d2f58 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -117,7 +117,7 @@ const Status = { return hits }, - muted () { return !this.unmuted && (this.status.muted || this.muteWordHits.length > 0) }, + muted () { return !this.unmuted && (this.status.user.muted || this.status.thread_muted || this.muteWordHits.length > 0) }, hideFilteredStatuses () { return typeof this.$store.state.config.hideFilteredStatuses === 'undefined' ? this.$store.state.instance.hideFilteredStatuses |