moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not change word based muting logic

This commit is contained in:
taehoon 2019-09-13 16:55:17 -04:00
parent b10558f721
commit 2f79a7b4a0
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/conversation/conversation.js
View File

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

2
src/components/conversation/conversation.vue
View File

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

4
src/components/status/status.js
View File

@ -30,7 +30,7 @@ const Status = {
'noHeading',
'inlineExpanded',
'showPinned',
'forceUnmute'
'inProfile'
],
data () {
return {
@ -118,7 +118,7 @@ const Status = {
return hits
},
muted () { return !this.forceUnmute && !this.unmuted && (this.status.user.muted || this.muteWordHits.length > 0) },
muted () { return !this.unmuted && ((!this.inProfile && this.status.user.muted) || this.muteWordHits.length > 0) },
hideFilteredStatuses () {
return typeof this.$store.state.config.hideFilteredStatuses === 'undefined'
? this.$store.state.instance.hideFilteredStatuses

2
src/components/timeline/timeline.js
View File

@ -26,7 +26,7 @@ const Timeline = {
'embedded',
'count',
'pinnedStatusIds',
'forceUnmute'
'inProfile'
],
data () {
return {

4
src/components/timeline/timeline.vue
View File

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

5
src/components/user_profile/user_profile.vue
View File

@ -26,7 +26,7 @@
timeline-name="user"
:user-id="userId"
:pinned-status-ids="user.pinnedStatusIds"
:force-unmute="true"
:in-profile="true"
/>
<div
v-if="followsTabVisible"
@ -70,7 +70,7 @@
timeline-name="media"
:timeline="media"
:user-id="userId"
:force-unmute="true"
:in-profile="true"
/>
<Timeline
v-if="isUs"
@ -81,6 +81,7 @@
:title="$t('user_card.favorites')"
timeline-name="favorites"
:timeline="favorites"
:in-profile="true"
/>
</tab-switcher>
</div>