Merge branch '656' into 'develop'

Do not collapse thread muted posts when it's expanded/on the thread page and do not collapse muted user's posts on muted user's profile page

Closes #656

See merge request pleroma/pleroma-fe!953
This commit is contained in:
Shpuld Shpludson 2019-09-16 07:27:06 +00:00
commit 9b163d2816
7 changed files with 14 additions and 4 deletions

View File

@ -42,7 +42,8 @@ const conversation = {
'statusId', 'statusId',
'collapsable', 'collapsable',
'isPage', 'isPage',
'pinnedStatusIdsObject' 'pinnedStatusIdsObject',
'inProfile'
], ],
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)"
:in-profile="inProfile"
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',
'inProfile'
], ],
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.unmuted && ((!this.inProfile && this.status.user.muted) || (!this.inConversation && this.status.thread_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',
'inProfile'
], ],
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"
:in-profile="inProfile"
/> />
</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"
:in-profile="inProfile"
/> />
</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"
:in-profile="true"
/> />
<div <div
v-if="followsTabVisible" v-if="followsTabVisible"
@ -69,6 +70,7 @@
timeline-name="media" timeline-name="media"
:timeline="media" :timeline="media"
:user-id="userId" :user-id="userId"
:in-profile="true"
/> />
<Timeline <Timeline
v-if="isUs" v-if="isUs"
@ -79,6 +81,7 @@
:title="$t('user_card.favorites')" :title="$t('user_card.favorites')"
timeline-name="favorites" timeline-name="favorites"
:timeline="favorites" :timeline="favorites"
:in-profile="true"
/> />
</tab-switcher> </tab-switcher>
</div> </div>

View File

@ -224,6 +224,7 @@ export const parseStatus = (data) => {
output.statusnet_conversation_id = data.pleroma.conversation_id output.statusnet_conversation_id = data.pleroma.conversation_id
output.is_local = pleroma.local output.is_local = pleroma.local
output.in_reply_to_screen_name = data.pleroma.in_reply_to_account_acct output.in_reply_to_screen_name = data.pleroma.in_reply_to_account_acct
output.thread_muted = pleroma.thread_muted
} else { } else {
output.text = data.content output.text = data.content
output.summary = data.spoiler_text output.summary = data.spoiler_text