multiple fixes

This commit is contained in:
Henry Jameson 2020-05-26 01:01:25 +03:00
parent 83e5ee5494
commit 9d09e4090f
4 changed files with 8 additions and 10 deletions

View file

@ -1,3 +1,4 @@
import StatusContent from '../status_content/status_content.vue'
import Status from '../status/status.vue' import Status from '../status/status.vue'
import UserAvatar from '../user_avatar/user_avatar.vue' import UserAvatar from '../user_avatar/user_avatar.vue'
import UserCard from '../user_card/user_card.vue' import UserCard from '../user_card/user_card.vue'
@ -16,10 +17,11 @@ const Notification = {
}, },
props: [ 'notification' ], props: [ 'notification' ],
components: { components: {
Status, StatusContent,
UserAvatar, UserAvatar,
UserCard, UserCard,
Timeago Timeago,
Status,
}, },
methods: { methods: {
toggleUserExpanded () { toggleUserExpanded () {

View file

@ -157,11 +157,9 @@
</router-link> </router-link>
</div> </div>
<template v-else> <template v-else>
<status <status-content
class="faint" class="faint"
:compact="true" :status="notification.action"
:statusoid="notification.action"
:no-heading="true"
/> />
</template> </template>
</div> </div>

View file

@ -122,8 +122,6 @@ const Status = {
this.muteWordHits.length > 0 this.muteWordHits.length > 0
) )
const excusesNotToMute = ( const excusesNotToMute = (
// Currently showing status
this.unmuted ||
( (
this.inProfile && ( this.inProfile && (
// Don't mute user's posts on user timeline (except reblogs) // Don't mute user's posts on user timeline (except reblogs)
@ -137,7 +135,7 @@ const Status = {
// No excuses if post has muted words // No excuses if post has muted words
) && !this.muteWordHits.length > 0 ) && !this.muteWordHits.length > 0
return !excusesNotToMute && reasonsToMute return !this.unmuted && !excusesNotToMute && reasonsToMute
}, },
hideFilteredStatuses () { hideFilteredStatuses () {
return this.mergedConfig.hideFilteredStatuses return this.mergedConfig.hideFilteredStatuses

View file

@ -386,7 +386,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
state.notifications.desktopNotificationSilence || state.notifications.desktopNotificationSilence ||
!visibleNotificationTypes.includes(notification.type) || !visibleNotificationTypes.includes(notification.type) ||
( (
status && ( notification.type === 'mention' && status && (
status.muted || status.muted ||
muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0 muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0
) )