Commit 9d09e409 authored by HJ's avatar HJ 🐼

multiple fixes

parent 83e5ee54
import StatusContent from '../status_content/status_content.vue'
import Status from '../status/status.vue'
import UserAvatar from '../user_avatar/user_avatar.vue'
import UserCard from '../user_card/user_card.vue'
......@@ -16,10 +17,11 @@ const Notification = {
},
props: [ 'notification' ],
components: {
Status,
StatusContent,
UserAvatar,
UserCard,
Timeago
Timeago,
Status,
},
methods: {
toggleUserExpanded () {
......
......@@ -157,11 +157,9 @@
</router-link>
</div>
<template v-else>
<status
<status-content
class="faint"
:compact="true"
:statusoid="notification.action"
:no-heading="true"
:status="notification.action"
/>
</template>
</div>
......
......@@ -122,8 +122,6 @@ const Status = {
this.muteWordHits.length > 0
)
const excusesNotToMute = (
// Currently showing status
this.unmuted ||
(
this.inProfile && (
// Don't mute user's posts on user timeline (except reblogs)
......@@ -137,7 +135,7 @@ const Status = {
// No excuses if post has muted words
) && !this.muteWordHits.length > 0
return !excusesNotToMute && reasonsToMute
return !this.unmuted && !excusesNotToMute && reasonsToMute
},
hideFilteredStatuses () {
return this.mergedConfig.hideFilteredStatuses
......
......@@ -386,7 +386,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
state.notifications.desktopNotificationSilence ||
!visibleNotificationTypes.includes(notification.type) ||
(
status && (
notification.type === 'mention' && status && (
status.muted ||
muteWordHits(status, rootGetters.mergedConfig.muteWords).length === 0
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment