diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-09-20 15:23:13 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-09-20 15:23:13 +0000 |
| commit | dcef84363ff0656940d095d2c010ca13252000e8 (patch) | |
| tree | 9e92df60075bee0285e6b34d8b433cb6065f3b3f /src/components/extra_buttons/extra_buttons.vue | |
| parent | 9b163d281670e0c0a589adce46727284fbcba0ad (diff) | |
| parent | 1306fac38f46b5578d46cc6abd6168a3399886b1 (diff) | |
Merge branch 'muting-fixes' into 'develop'
Properly detect thread-muted posts and set `with_muted` when fetching notifications
See merge request pleroma/pleroma-fe!941
Diffstat (limited to 'src/components/extra_buttons/extra_buttons.vue')
| -rw-r--r-- | src/components/extra_buttons/extra_buttons.vue | 4 |
1 files changed, 2 insertions, 2 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" > |