|
|
@ -67,7 +67,8 @@ const visibleNotificationTypes = (rootState) => {
|
|
|
|
rootState.config.notificationVisibility.likes && 'like',
|
|
|
|
rootState.config.notificationVisibility.likes && 'like',
|
|
|
|
rootState.config.notificationVisibility.mentions && 'mention',
|
|
|
|
rootState.config.notificationVisibility.mentions && 'mention',
|
|
|
|
rootState.config.notificationVisibility.repeats && 'repeat',
|
|
|
|
rootState.config.notificationVisibility.repeats && 'repeat',
|
|
|
|
rootState.config.notificationVisibility.follows && 'follow'
|
|
|
|
rootState.config.notificationVisibility.follows && 'follow',
|
|
|
|
|
|
|
|
rootState.config.notificationVisibility.moves && 'move'
|
|
|
|
].filter(_ => _)
|
|
|
|
].filter(_ => _)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -306,7 +307,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
|
|
|
|
|
|
|
|
|
|
|
|
const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters }) => {
|
|
|
|
const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters }) => {
|
|
|
|
each(notifications, (notification) => {
|
|
|
|
each(notifications, (notification) => {
|
|
|
|
if (notification.type !== 'follow') {
|
|
|
|
if (notification.type !== 'follow' && notification.type !== 'move') {
|
|
|
|
notification.action = addStatusToGlobalStorage(state, notification.action).item
|
|
|
|
notification.action = addStatusToGlobalStorage(state, notification.action).item
|
|
|
|
notification.status = notification.status && addStatusToGlobalStorage(state, notification.status).item
|
|
|
|
notification.status = notification.status && addStatusToGlobalStorage(state, notification.status).item
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -339,6 +340,9 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
|
|
|
|
case 'follow':
|
|
|
|
case 'follow':
|
|
|
|
i18nString = 'followed_you'
|
|
|
|
i18nString = 'followed_you'
|
|
|
|
break
|
|
|
|
break
|
|
|
|
|
|
|
|
case 'move':
|
|
|
|
|
|
|
|
i18nString = 'migrated_to'
|
|
|
|
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (i18nString) {
|
|
|
|
if (i18nString) {
|
|
|
|