do not collapse muted user's posts on muted user's profile page

This commit is contained in:
taehoon 2019-09-13 15:34:17 -04:00
parent 09db4ceb1a
commit 09deb69bc7
6 changed files with 11 additions and 4 deletions

View file

@ -42,7 +42,8 @@ const conversation = {
'statusId',
'collapsable',
'isPage',
'pinnedStatusIdsObject'
'pinnedStatusIdsObject',
'forceUnmute'
],
created () {
if (this.isPage) {

View file

@ -26,6 +26,7 @@
:in-conversation="isExpanded"
:highlight="getHighlight()"
:replies="getReplies(status.id)"
:force-unmute="forceUnmute"
class="status-fadein panel-body"
@goto="setHighlight"
@toggleExpanded="toggleExpanded"

View file

@ -29,7 +29,8 @@ const Status = {
'isPreview',
'noHeading',
'inlineExpanded',
'showPinned'
'showPinned',
'forceUnmute'
],
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.forceUnmute && !this.unmuted && (this.status.user.muted || this.muteWordHits.length > 0) },
hideFilteredStatuses () {
return typeof this.$store.state.config.hideFilteredStatuses === 'undefined'
? this.$store.state.instance.hideFilteredStatuses

View file

@ -25,7 +25,8 @@ const Timeline = {
'tag',
'embedded',
'count',
'pinnedStatusIds'
'pinnedStatusIds',
'forceUnmute'
],
data () {
return {

View file

@ -36,6 +36,7 @@
:status-id="statusId"
:collapsable="true"
:pinned-status-ids-object="pinnedStatusIdsObject"
:force-unmute="forceUnmute"
/>
</template>
<template v-for="status in timeline.visibleStatuses">
@ -45,6 +46,7 @@
class="status-fadein"
:status-id="status.id"
:collapsable="true"
:force-unmute="forceUnmute"
/>
</template>
</div>

View file

@ -26,6 +26,7 @@
timeline-name="user"
:user-id="userId"
:pinned-status-ids="user.pinnedStatusIds"
:force-unmute="true"
/>
<div
v-if="followsTabVisible"