Progress

app/javascript/gabsocial/reducers/notifications.js

@@ -30,6 +30,11 @@ const initialState = ImmutableMap({
   queuedNotifications: ImmutableList(), //max = MAX_QUEUED_NOTIFICATIONS
   totalQueuedNotificationsCount: 0, //used for queuedItems overflow for MAX_QUEUED_NOTIFICATIONS+
   lastRead: -1,
+  filter: ImmutableMap({
+    active: 'all',
+    onlyVerified: false,
+    onlyFollowing: false,
+  }),
 });
 
 const notificationToMap = notification => ImmutableMap({
@@ -64,7 +69,7 @@ const expandNormalizedNotifications = (state, notifications, next) => {
   
   let items = ImmutableList()
 
-  console.log("notifications:", notificationss)
+  console.log("notifications:", notifications)
 
   notifications.forEach((n) => {
     const notification = notificationToMap(n)
@@ -211,7 +216,10 @@ export default function notifications(state = initialState, action) {
   case NOTIFICATIONS_EXPAND_FAIL:
     return state.set('isLoading', false);
   case NOTIFICATIONS_FILTER_SET:
-    return state.set('items', ImmutableList()).set('hasMore', true);
+    return state.withMutations(mutable => {
+      mutable.set('items', ImmutableList()).set('hasMore', true)
+      mutable.setIn(['filter', action.path], action.value)
+    })
   case NOTIFICATIONS_SCROLL_TOP:
     return updateTop(state, action.top);
   case NOTIFICATIONS_UPDATE:

app/javascript/gabsocial/reducers/settings.js

@@ -1,5 +1,4 @@
 import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings';
-import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
 import { STORE_HYDRATE } from '../actions/store';
 import { EMOJI_USE } from '../actions/emojis';
 import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
@@ -43,15 +42,6 @@ const initialState = ImmutableMap({
     }),
   }),
 
-  notifications: ImmutableMap({
-    // : todo : put all notification settings actually IN settings
-    quickFilter: ImmutableMap({
-      active: 'all',
-      onlyVerifed: false,
-      onlyFollowing: false,
-    }),
-  }),
-
   community: ImmutableMap({
     shows: ImmutableMap({
       inSidebar: false,
@@ -76,7 +66,6 @@ export default function settings(state = initialState, action) {
   switch(action.type) {
   case STORE_HYDRATE:
     return hydrate(state, action.state.get('settings'));
-  case NOTIFICATIONS_FILTER_SET:
   case SETTING_CHANGE:
     return state
       .setIn(action.path, action.value)