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', 'statusId',
'collapsable', 'collapsable',
'isPage', 'isPage',
'pinnedStatusIdsObject' 'pinnedStatusIdsObject',
'forceUnmute'
], ],
created () { created () {
if (this.isPage) { if (this.isPage) {

View file

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

View file

@ -29,7 +29,8 @@ const Status = {
'isPreview', 'isPreview',
'noHeading', 'noHeading',
'inlineExpanded', 'inlineExpanded',
'showPinned' 'showPinned',
'forceUnmute'
], ],
data () { data () {
return { return {
@ -117,7 +118,7 @@ const Status = {
return hits 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 () { hideFilteredStatuses () {
return typeof this.$store.state.config.hideFilteredStatuses === 'undefined' return typeof this.$store.state.config.hideFilteredStatuses === 'undefined'
? this.$store.state.instance.hideFilteredStatuses ? this.$store.state.instance.hideFilteredStatuses

View file

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

View file

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

View file

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