progress

app/javascript/gabsocial/reducers/settings.js

@@ -1,21 +1,21 @@
-import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings';
-import { STORE_HYDRATE } from '../actions/store';
-import { EMOJI_USE } from '../actions/emojis';
-import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
-import { Map as ImmutableMap, fromJS } from 'immutable';
-import uuid from '../utils/uuid';
+import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings'
+import { STORE_HYDRATE } from '../actions/store'
+import { EMOJI_USE } from '../actions/emojis'
+import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists'
+import { Map as ImmutableMap, fromJS } from 'immutable'
+import uuid from '../utils/uuid'
 
 const initialState = ImmutableMap({
   saved: true,
   onboarded: false,
   skinTone: 1,
 
-  // displayOptions: ImmutableMap({
-  //   fontSize: 'normal',
-  //   radiusSmallEnabled: true,
-  //   radiusCircleEnabled: true,
-  //   theme: 'light',
-  // }),
+  displayOptions: ImmutableMap({
+    fontSize: 'normal',
+    radiusSmallDisabled: false,
+    radiusCircleDisabled: false,
+    theme: 'light',
+  }),
 
   home: ImmutableMap({
     shows: ImmutableMap({
@@ -27,26 +27,6 @@ const initialState = ImmutableMap({
     }),
   }),
 
-  lists: ImmutableMap({
-    shows: ImmutableMap({
-      photos: true,
-      polls: true,
-      reply: true,
-      repost: true,
-      videos: true,
-    }),
-  }),
-
-  groups: ImmutableMap({
-    shows: ImmutableMap({
-      photos: true,
-      polls: true,
-      reply: true,
-      repost: true,
-      videos: true,
-    }),
-  }),
-
   community: ImmutableMap({
     shows: ImmutableMap({
       inSidebar: false,

app/javascript/gabsocial/reducers/user_lists.js

@@ -23,6 +23,7 @@ import {
 } from '../actions/accounts'
 import {
   REPOSTS_FETCH_SUCCESS,
+  LIKES_FETCH_SUCCESS,
 } from '../actions/interactions'
 import {
   BLOCKS_FETCH_REQUEST,
@@ -52,7 +53,7 @@ const initialState = ImmutableMap({
   followers: ImmutableMap(),
   following: ImmutableMap(),
   reblogged_by: ImmutableMap(),
-  favorited_by: ImmutableMap(),
+  liked_by: ImmutableMap(),
   follow_requests: ImmutableMap(),
   blocks: ImmutableMap(),
   mutes: ImmutableMap(),
@@ -103,6 +104,8 @@ export default function userLists(state = initialState, action) {
     return state.setIn(['following', action.id, 'isLoading'], false);
   case REPOSTS_FETCH_SUCCESS:
     return state.setIn(['reblogged_by', action.id], ImmutableList(action.accounts.map(item => item.id)));
+  case LIKES_FETCH_SUCCESS:
+    return state.setIn(['liked_by', action.id], ImmutableList(action.accounts.map(item => item.id)));
   case FOLLOW_REQUESTS_FETCH_SUCCESS:
     return state.setIn(['follow_requests', 'items'], ImmutableList(action.accounts.map(item => item.id))).setIn(['follow_requests', 'next'], action.next).setIn(['follow_requests', 'isLoading'], false);
   case FOLLOW_REQUESTS_EXPAND_SUCCESS: