diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-12-02 12:17:43 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-12-02 12:17:43 +0000 |
| commit | d3adffbefecb7029e5bc83048a933907c7317327 (patch) | |
| tree | 8ec7663606b4bc7bb3b5109775983cf7e492d47d /src/components/status/status.js | |
| parent | 0c6737f33612f6808f687b896cc6e73ba635f0d2 (diff) | |
| parent | 40e774e05abfce6da3c558c09ce1750c132a580f (diff) | |
Merge branch '719' into 'develop'
Fix "Muted users not being collapsed on other user's profiles"
Closes #719
See merge request pleroma/pleroma-fe!1013
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 714ea6d2..c49e729c 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -33,7 +33,8 @@ const Status = { 'noHeading', 'inlineExpanded', 'showPinned', - 'inProfile' + 'inProfile', + 'profileUserId' ], data () { return { @@ -115,7 +116,7 @@ const Status = { return hits }, - muted () { return !this.unmuted && ((!this.inProfile && this.status.user.muted) || (!this.inConversation && this.status.thread_muted) || this.muteWordHits.length > 0) }, + muted () { return !this.unmuted && ((!(this.inProfile && this.status.user.id === this.profileUserId) && this.status.user.muted) || (!this.inConversation && this.status.thread_muted) || this.muteWordHits.length > 0) }, hideFilteredStatuses () { return this.mergedConfig.hideFilteredStatuses }, |