From b22b2cbfacdaef2441d14f401c95863d8ca2e66c Mon Sep 17 00:00:00 2001
From: Eugen <eugen@zeonfederated.com>
Date: Tue, 11 Apr 2017 22:53:58 +0200
Subject: Fix #1491 - Fix broken notifications, broken Link header parsing for
 exclude_types (#1548)

---
 app/assets/javascripts/components/actions/notifications.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/components/actions/notifications.jsx')

diff --git a/app/assets/javascripts/components/actions/notifications.jsx b/app/assets/javascripts/components/actions/notifications.jsx
index 11e814e1f..b09ca0854 100644
--- a/app/assets/javascripts/components/actions/notifications.jsx
+++ b/app/assets/javascripts/components/actions/notifications.jsx
@@ -50,6 +50,8 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
   };
 };
 
+const excludeTypesFromSettings = state => state.getIn(['settings', 'notifications', 'shows']).filter(enabled => !enabled).keySeq().toJS();
+
 export function refreshNotifications() {
   return (dispatch, getState) => {
     dispatch(refreshNotificationsRequest());
@@ -61,7 +63,7 @@ export function refreshNotifications() {
       params.since_id = ids.first().get('id');
     }
 
-    params.exclude_types = getState().getIn(['settings', 'notifications', 'shows']).filter(enabled => !enabled).keySeq().toJS();
+    params.exclude_types = excludeTypesFromSettings(getState());
 
     api(getState).get('/api/v1/notifications', { params }).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
@@ -109,7 +111,7 @@ export function expandNotifications() {
 
     const params = {};
 
-    params.exclude_types = getState().getIn(['settings', 'notifications', 'shows']).filter(enabled => !enabled).keySeq().toJS();
+    params.exclude_types = excludeTypesFromSettings(getState());
 
     api(getState).get(url, params).then(response => {
       const next = getLinks(response).refs.find(link => link.rel === 'next');
-- 
cgit 

