diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-01-03 10:16:42 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2020-01-03 10:16:42 +0000 |
| commit | ad97e03b59783d655c7d414e27b0bce41a6a4ee6 (patch) | |
| tree | 817b578e53b884c4b5facd63c166b522f59a8978 /src/modules/statuses.js | |
| parent | 1a82a00a2b45041c35b72ab16ee34c120341b652 (diff) | |
| parent | 215662afdee3935f66e5fbd73260e2039f5216de (diff) | |
Merge branch 'fix-move-type-notification' into 'develop'
Fix for move type notification
See merge request pleroma/pleroma-fe!1026
Diffstat (limited to 'src/modules/statuses.js')
| -rw-r--r-- | src/modules/statuses.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js index 7d88761c..16dae8ce 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -67,7 +67,8 @@ const visibleNotificationTypes = (rootState) => { rootState.config.notificationVisibility.likes && 'like', rootState.config.notificationVisibility.mentions && 'mention', rootState.config.notificationVisibility.repeats && 'repeat', - rootState.config.notificationVisibility.follows && 'follow' + rootState.config.notificationVisibility.follows && 'follow', + rootState.config.notificationVisibility.moves && 'move' ].filter(_ => _) } @@ -306,7 +307,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us const addNewNotifications = (state, { dispatch, notifications, older, visibleNotificationTypes, rootGetters }) => { each(notifications, (notification) => { - if (notification.type !== 'follow') { + if (notification.type !== 'follow' && notification.type !== 'move') { notification.action = addStatusToGlobalStorage(state, notification.action).item notification.status = notification.status && addStatusToGlobalStorage(state, notification.status).item } @@ -339,6 +340,9 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot case 'follow': i18nString = 'followed_you' break + case 'move': + i18nString = 'migrated_to' + break } if (i18nString) { |
