diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-16 11:38:37 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-16 11:38:37 +0000 |
| commit | 1306fac38f46b5578d46cc6abd6168a3399886b1 (patch) | |
| tree | 9e92df60075bee0285e6b34d8b433cb6065f3b3f /src/components/status/status.js | |
| parent | b33667a74342a9fc91386d12763b5c2f1101868a (diff) | |
| parent | 9b163d281670e0c0a589adce46727284fbcba0ad (diff) | |
Merge branch 'develop' into 'muting-fixes'
# Conflicts:
# src/components/status/status.js
Diffstat (limited to 'src/components/status/status.js')
| -rw-r--r-- | src/components/status/status.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index b72d2f58..d17ba318 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -29,7 +29,8 @@ const Status = { 'isPreview', 'noHeading', 'inlineExpanded', - 'showPinned' + 'showPinned', + 'inProfile' ], data () { return { @@ -117,7 +118,7 @@ const Status = { return hits }, - muted () { return !this.unmuted && (this.status.user.muted || this.status.thread_muted || this.muteWordHits.length > 0) }, + muted () { return !this.unmuted && ((!this.inProfile && this.status.user.muted) || (!this.inConversation && this.status.thread_muted) || this.muteWordHits.length > 0) }, hideFilteredStatuses () { return typeof this.$store.state.config.hideFilteredStatuses === 'undefined' ? this.$store.state.instance.hideFilteredStatuses |