aboutsummaryrefslogtreecommitdiff
path: root/src/components/status/status.js
diff options
context:
space:
mode:
authortaehoon <th.dev91@gmail.com>2019-11-25 12:25:01 -0500
committertaehoon <th.dev91@gmail.com>2019-11-25 12:25:01 -0500
commit40e774e05abfce6da3c558c09ce1750c132a580f (patch)
tree7d26f215dec2a4fc2176dc969974a462e8b87f99 /src/components/status/status.js
parent41d2fa2fd66ca33b0c83f65d608ee37f8ffcb152 (diff)
restore muted users collapsing logic on other user’s profiles
Diffstat (limited to 'src/components/status/status.js')
-rw-r--r--src/components/status/status.js5
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
},