diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-26 21:40:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 21:40:28 +0100 |
| commit | ff2270cd061b2dc3fc86a5b2bd77d0a3408b5716 (patch) | |
| tree | 75adb7dc4d3c37ecf87b43659538e20ec198d804 /app/javascript/flavours/glitch | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
| parent | 1e06ca1c0af98cf61b1114b93249fb447e795edb (diff) | |
Merge pull request #930 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/notifications.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js index 6667966c0..04ae3d406 100644 --- a/app/javascript/flavours/glitch/reducers/notifications.js +++ b/app/javascript/flavours/glitch/reducers/notifications.js @@ -207,8 +207,9 @@ export default function notifications(state = initialState, action) { case NOTIFICATIONS_EXPAND_SUCCESS: return expandNormalizedNotifications(state, action.notifications, action.next); case ACCOUNT_BLOCK_SUCCESS: - case ACCOUNT_MUTE_SUCCESS: return filterNotifications(state, action.relationship); + case ACCOUNT_MUTE_SUCCESS: + return action.relationship.muting_notifications ? filterNotifications(state, action.relationship) : state; case NOTIFICATIONS_CLEAR: return state.set('items', ImmutableList()).set('hasMore', false); case TIMELINE_DELETE: |