diff --git a/src/components/confirm_modal/mute_confirm.js b/src/components/confirm_modal/mute_confirm.js index 709296be8..62f8c3de3 100644 --- a/src/components/confirm_modal/mute_confirm.js +++ b/src/components/confirm_modal/mute_confirm.js @@ -5,7 +5,7 @@ import ConfirmModal from './confirm_modal.vue' import Select from 'src/components/select/select.vue' export default { - props: ['type', 'user', 'status'], + props: ['type', 'user'], emits: ['hide', 'show', 'muted'], data: () => ({ showing: false, diff --git a/src/components/status/status.js b/src/components/status/status.js index 7b9b92fad..f3a1bbee0 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -255,7 +255,7 @@ const Status = { muteReasons () { return [ this.userIsMuted ? 'user' : null, - this.status.thread_muted ? 'thread' : null, + status.thread_muted ? 'thread' : null, (this.muteWordHits.length > 0) ? 'wordfilter' : null, (this.muteBotStatuses && this.botStatus) ? 'bot' : null, (this.muteSensitiveStatuses && this.sensitiveStatus) ? 'nsfw' : null @@ -280,19 +280,14 @@ const Status = { case 'nsfw': return this.$t('status.sensitive_muted') } } - console.log(this.status) - if (this.muteReasons.length > 1) { - return this.$t( - 'status.multi_reason_mute', - { - main: mainReason(), - numReasonsMore: this.muteReasons.length - 1 - }, - this.muteReasons.length - 1 - ) - } else { - return mainReason() - } + return this.$t( + 'status.multi_reason_mute', + { + main: mainReason(), + numReasonsMore: this.muteReasons.length - 1 + }, + this.muteReasons.length - 1 + ) }, muted () { if (this.statusoid.user.id === this.currentUser.id) return false @@ -304,7 +299,7 @@ const Status = { const { reblog } = status const relationship = this.$store.getters.relationship(status.user.id) const relationshipReblog = reblog && this.$store.getters.relationship(reblog.user.id) - return (status.muted && !status.thread_muted) || + return status.muted || // Reprööt of a muted post according to BE (reblog && reblog.muted) || // Muted user diff --git a/src/components/status_action_buttons/action_button_container.js b/src/components/status_action_buttons/action_button_container.js index bd91b9404..6bd3fde54 100644 --- a/src/components/status_action_buttons/action_button_container.js +++ b/src/components/status_action_buttons/action_button_container.js @@ -58,8 +58,8 @@ export default { unmuteUser () { return this.$store.dispatch('unmuteUser', this.user.id) }, - unmuteConversation () { - return this.$store.dispatch('unmuteConversation', { id: this.status.id }) + unmuteThread () { + return this.$store.dispatch('unmuteConversation', this.user.id) }, unmuteDomain () { return this.$store.dispatch('unmuteDomain', this.user.id) diff --git a/src/components/status_action_buttons/action_button_container.vue b/src/components/status_action_buttons/action_button_container.vue index deada02ae..d860297d8 100644 --- a/src/components/status_action_buttons/action_button_container.vue +++ b/src/components/status_action_buttons/action_button_container.vue @@ -2,7 +2,7 @@
@@ -40,13 +40,13 @@