Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Keep notification when muting_notifications is true (#7311)

Browse source 
* Keep notification when muting_notifications is true

* Retrun mute object

* Fix test
This commit is contained in:
abcang 2018-05-02 23:14:51 +09:00 • committed by Eugen Rochko
parent d0cdd5cf94
commit 71a7cea73f
4 changed files with 34 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/reducers/notifications.js
View file

@ -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: