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
This commit is contained in:
Shpuld Shpludson 2019-12-02 12:17:43 +00:00
commit d3adffbefe
4 changed files with 8 additions and 3 deletions

View file

@ -43,7 +43,8 @@ const conversation = {
'collapsable', 'collapsable',
'isPage', 'isPage',
'pinnedStatusIdsObject', 'pinnedStatusIdsObject',
'inProfile' 'inProfile',
'profileUserId'
], ],
created () { created () {
if (this.isPage) { if (this.isPage) {

View file

@ -27,6 +27,7 @@
:highlight="getHighlight()" :highlight="getHighlight()"
:replies="getReplies(status.id)" :replies="getReplies(status.id)"
:in-profile="inProfile" :in-profile="inProfile"
:profile-user-id="profileUserId"
class="status-fadein panel-body" class="status-fadein panel-body"
@goto="setHighlight" @goto="setHighlight"
@toggleExpanded="toggleExpanded" @toggleExpanded="toggleExpanded"

View file

@ -33,7 +33,8 @@ const Status = {
'noHeading', 'noHeading',
'inlineExpanded', 'inlineExpanded',
'showPinned', 'showPinned',
'inProfile' 'inProfile',
'profileUserId'
], ],
data () { data () {
return { return {
@ -115,7 +116,7 @@ const Status = {
return hits 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 () { hideFilteredStatuses () {
return this.mergedConfig.hideFilteredStatuses return this.mergedConfig.hideFilteredStatuses
}, },

View file

@ -37,6 +37,7 @@
:collapsable="true" :collapsable="true"
:pinned-status-ids-object="pinnedStatusIdsObject" :pinned-status-ids-object="pinnedStatusIdsObject"
:in-profile="inProfile" :in-profile="inProfile"
:profile-user-id="userId"
/> />
</template> </template>
<template v-for="status in timeline.visibleStatuses"> <template v-for="status in timeline.visibleStatuses">
@ -47,6 +48,7 @@
:status-id="status.id" :status-id="status.id"
:collapsable="true" :collapsable="true"
:in-profile="inProfile" :in-profile="inProfile"
:profile-user-id="userId"
/> />
</template> </template>
</div> </div>