Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

do not change word based muting logic

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

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

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

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

@ -30,7 +30,7 @@ const Status = {
'noHeading', 'noHeading',
'inlineExpanded', 'inlineExpanded',
'showPinned', 'showPinned',
'forceUnmute' 'inProfile'
], ],
data () { data () {
return { return {
@ -118,7 +118,7 @@ const Status = {
return hits 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 () { 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

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

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

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

@ -36,7 +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" :in-profile="inProfile"
/> />
</template> </template>
<template v-for="status in timeline.visibleStatuses"> <template v-for="status in timeline.visibleStatuses">
@ -46,7 +46,7 @@
class="status-fadein" class="status-fadein"
:status-id="status.id" :status-id="status.id"
:collapsable="true" :collapsable="true"
:force-unmute="forceUnmute" :in-profile="inProfile"
/> />
</template> </template>
</div> </div>

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

@ -26,7 +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" :in-profile="true"
/> />
<div <div
v-if="followsTabVisible" v-if="followsTabVisible"
@ -70,7 +70,7 @@
timeline-name="media" timeline-name="media"
:timeline="media" :timeline="media"
:user-id="userId" :user-id="userId"
:force-unmute="true" :in-profile="true"
/> />
<Timeline <Timeline
v-if="isUs" v-if="isUs"
@ -81,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>