diff options
| author | abcang <abcang1015@gmail.com> | 2018-05-02 23:14:51 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-05-02 16:14:51 +0200 |
| commit | 71a7cea73fdfb45d06986e108b2ce1dbf7e32579 (patch) | |
| tree | 29c2193e8dbb97f6adea550e71a3cb565de76da5 /app/javascript/mastodon/reducers/notifications.js | |
| parent | d0cdd5cf94ff479e4037dc47539f7f9c408831b3 (diff) | |
Keep notification when muting_notifications is true (#7311)
* Keep notification when muting_notifications is true * Retrun mute object * Fix test
Diffstat (limited to 'app/javascript/mastodon/reducers/notifications.js')
| -rw-r--r-- | app/javascript/mastodon/reducers/notifications.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js index da9b8c420..84d4fc698 100644 --- a/app/javascript/mastodon/reducers/notifications.js +++ b/app/javascript/mastodon/reducers/notifications.js @@ -105,7 +105,7 @@ export default function notifications(state = initialState, action) { return expandNormalizedNotifications(state, action.notifications, action.next); case ACCOUNT_BLOCK_SUCCESS: case ACCOUNT_MUTE_SUCCESS: - return filterNotifications(state, action.relationship); + return action.relationship.muting_notifications ? filterNotifications(state, action.relationship) : state; case NOTIFICATIONS_CLEAR: return state.set('items', ImmutableList()).set('hasMore', false); case TIMELINE_DELETE: |