Progress

app/javascript/gabsocial/reducers/relationships.js

@@ -10,41 +10,47 @@ import {
   ACCOUNT_MUTE_SUCCESS,
   ACCOUNT_UNMUTE_SUCCESS,
   RELATIONSHIPS_FETCH_SUCCESS,
-} from '../actions/accounts';
-import { Map as ImmutableMap, fromJS } from 'immutable';
+} from '../actions/accounts'
+import {
+  BLOCK_CHAT_MESSAGER_SUCCESS,
+  UNBLOCK_CHAT_MESSAGER_SUCCESS,
+} from '../actions/chat_conversation_accounts'
+import { Map as ImmutableMap, fromJS } from 'immutable'
 
-const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship));
+const normalizeRelationship = (state, relationship) => state.set(relationship.id, fromJS(relationship))
 
 const normalizeRelationships = (state, relationships) => {
   relationships.forEach(relationship => {
-    state = normalizeRelationship(state, relationship);
-  });
+    state = normalizeRelationship(state, relationship)
+  })
 
-  return state;
-};
+  return state
+}
 
-const initialState = ImmutableMap();
+const initialState = ImmutableMap()
 
 export default function relationships(state = initialState, action) {
   switch(action.type) {
   case ACCOUNT_FOLLOW_REQUEST:
-    return state.setIn([action.id, action.locked ? 'requested' : 'following'], true);
+    return state.setIn([action.id, action.locked ? 'requested' : 'following'], true)
   case ACCOUNT_FOLLOW_FAIL:
-    return state.setIn([action.id, action.locked ? 'requested' : 'following'], false);
+    return state.setIn([action.id, action.locked ? 'requested' : 'following'], false)
   case ACCOUNT_UNFOLLOW_REQUEST:
-    return state.setIn([action.id, 'following'], false);
+    return state.setIn([action.id, 'following'], false)
   case ACCOUNT_UNFOLLOW_FAIL:
-    return state.setIn([action.id, 'following'], true);
+    return state.setIn([action.id, 'following'], true)
   case ACCOUNT_FOLLOW_SUCCESS:
   case ACCOUNT_UNFOLLOW_SUCCESS:
   case ACCOUNT_BLOCK_SUCCESS:
   case ACCOUNT_UNBLOCK_SUCCESS:
   case ACCOUNT_MUTE_SUCCESS:
   case ACCOUNT_UNMUTE_SUCCESS:
-    return normalizeRelationship(state, action.relationship);
+  case BLOCK_CHAT_MESSAGER_SUCCESS:
+  case UNBLOCK_CHAT_MESSAGER_SUCCESS:
+    return normalizeRelationship(state, action.relationship)
   case RELATIONSHIPS_FETCH_SUCCESS:
-    return normalizeRelationships(state, action.relationships);
+    return normalizeRelationships(state, action.relationships)
   default:
-    return state;
+    return state
   }
-};
+}

app/javascript/gabsocial/reducers/settings.js

@@ -50,18 +50,12 @@ const initialState = ImmutableMap({
     theme: 'white',
   }),
 
-  home: ImmutableMap({
-    shows: ImmutableMap({
-      reply: true,
-      repost: true,
-    }),
-  }),
-
-  community: ImmutableMap({
-    shows: ImmutableMap({
-      onlyMedia: false,
-    }),
-  }),
+  // home: ImmutableMap({
+  //   shows: ImmutableMap({
+  //     reply: true,
+  //     repost: true,
+  //   }),
+  // }),
 })
 
 const defaultColumns = fromJS([

app/javascript/gabsocial/reducers/toasts.js

@@ -5,14 +5,19 @@ import {
 } from '../actions/toasts'
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable'
 
+const makeMessageFromData = (data) => {
+  return `${data.type}`.split('_').join(' ').toLowerCase()
+}
+
 const initialState = ImmutableList([])
 
 export default function toasts(state = initialState, action) {
   switch(action.type) {
   case TOAST_SHOW:
+    console.log("action:", action)
     return state.set(state.size, ImmutableMap({
       key: state.size > 0 ? state.last().get('key') + 1 : 0,
-      message: 'action.message',
+      message: makeMessageFromData(action.toastData),
       type: action.toastType,
     }))
   case TOAST_DISMISS:

app/javascript/gabsocial/reducers/user_lists.js

@@ -62,13 +62,6 @@ import {
   CHAT_MESSENGER_BLOCKS_EXPAND_REQUEST,
   CHAT_MESSENGER_BLOCKS_EXPAND_SUCCESS,
   CHAT_MESSENGER_BLOCKS_EXPAND_FAIL,
-
-  CHAT_MESSENGER_MUTES_FETCH_REQUEST,
-  CHAT_MESSENGER_MUTES_FETCH_SUCCESS,
-  CHAT_MESSENGER_MUTES_FETCH_FAIL,
-  CHAT_MESSENGER_MUTES_EXPAND_REQUEST,
-  CHAT_MESSENGER_MUTES_EXPAND_SUCCESS,
-  CHAT_MESSENGER_MUTES_EXPAND_FAIL,
 } from '../actions/chat_conversation_accounts'
 import { 
   GROUP_MEMBERS_FETCH_SUCCESS,
@@ -243,17 +236,6 @@ export default function userLists(state = initialState, action) {
   case CHAT_MESSENGER_BLOCKS_EXPAND_FAIL:
     return setListFailed(state, 'chat_blocks', me)
 
-  case CHAT_MESSENGER_MUTES_FETCH_REQUEST:
-  case CHAT_MESSENGER_MUTES_EXPAND_REQUEST:
-    return state.setIn(['chat_mutes', me, 'isLoading'], true)
-  case CHAT_MESSENGER_MUTES_FETCH_SUCCESS:
-    return normalizeList(state, 'chat_mutes', me, action.accounts, action.next)
-  case CHAT_MESSENGER_MUTES_EXPAND_SUCCESS:
-    return appendToList(state, 'chat_mutes', me, action.accounts, action.next)
-  case CHAT_MESSENGER_MUTES_FETCH_FAIL:
-  case CHAT_MESSENGER_MUTES_EXPAND_FAIL:
-    return setListFailed(state, 'chat_mutes', me)
-
   default:
     return state;
   }