diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-09-16 07:27:06 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-09-16 07:27:06 +0000 |
| commit | 9b163d281670e0c0a589adce46727284fbcba0ad (patch) | |
| tree | c7aa9233aeb018edeec2560507198aeecaf86209 /src/components/status/status.js | |
| parent | 09db4ceb1a1ffbd1886648142f2cc2b287dcb5c9 (diff) | |
| parent | baebf08d20eed14d06f9253e4cc939891955f8cb (diff) | |
Merge branch '656' into 'develop'
Do not collapse thread muted posts when it's expanded/on the thread page and do not collapse muted user's posts on muted user's profile page
Closes #656
See merge request pleroma/pleroma-fe!953
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 502d9583..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.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 |