diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/notification/notification.js | 6 | ||||
| -rw-r--r-- | src/components/notification/notification.vue | 6 | ||||
| -rw-r--r-- | src/components/status/status.js | 4 | ||||
| -rw-r--r-- | src/modules/statuses.js | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js index 1cf4c9bc..cacdce87 100644 --- a/src/components/notification/notification.js +++ b/src/components/notification/notification.js @@ -1,3 +1,4 @@ +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 () { diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue index 0e46a2a7..044ac871 100644 --- a/src/components/notification/notification.vue +++ b/src/components/notification/notification.vue @@ -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> diff --git a/src/components/status/status.js b/src/components/status/status.js index 95278968..73382521 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -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 diff --git a/src/modules/statuses.js b/src/modules/statuses.js index c809cf1c..9a2e0df1 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -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 ) |