Contexts: more refactoring

app/soapbox/reducers/__tests__/contexts-test.js

@@ -1,6 +1,11 @@
 import reducer from '../contexts';
 import { CONTEXT_FETCH_SUCCESS } from 'soapbox/actions/statuses';
-import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet } from 'immutable';
+import { TIMELINE_DELETE } from 'soapbox/actions/timelines';
+import {
+  Map as ImmutableMap,
+  OrderedSet as ImmutableOrderedSet,
+  fromJS,
+} from 'immutable';
 import context1 from 'soapbox/__fixtures__/context_1.json';
 import context2 from 'soapbox/__fixtures__/context_2.json';
 
@@ -48,4 +53,30 @@ describe('contexts reducer', () => {
       }),
     }));
   });
+
+  describe(TIMELINE_DELETE, () => {
+    it('deletes the status', () => {
+      const action = { type: TIMELINE_DELETE, id: 'B' };
+
+      const state = fromJS({
+        inReplyTos: {
+          B: 'A',
+          C: 'B',
+        },
+        replies: {
+          A: ImmutableOrderedSet(['B']),
+          B: ImmutableOrderedSet(['C']),
+        },
+      });
+
+      const expected = fromJS({
+        inReplyTos: {},
+        replies: {
+          A: ImmutableOrderedSet(),
+        },
+      });
+
+      expect(reducer(state, action)).toEqual(expected);
+    });
+  });
 });

app/soapbox/reducers/contexts.js

@@ -15,8 +15,8 @@ const initialState = ImmutableMap({
 const importStatus = (state, { id, in_reply_to_id }) => {
   if (!in_reply_to_id) return state;
 
-  return state.withMutation(state => {
+  return state.withMutations(state => {
-    state.setIn(['inReplyTos', id, in_reply_to_id]);
+    state.setIn(['inReplyTos', id], in_reply_to_id);
 
     state.updateIn(['replies', in_reply_to_id], ImmutableOrderedSet(), ids => {
       return ids.add(id).sort();
@@ -30,61 +30,58 @@ const importStatuses = (state, statuses) => {
   });
 };
 
-const normalizeContext = (immutableState, id, ancestors, descendants) => immutableState.withMutations(state => {
+const insertTombstone = (state, ancestorId, descendantId) => {
-  state.update('inReplyTos', immutableAncestors => immutableAncestors.withMutations(inReplyTos => {
+  const tombstoneId = `tombstone-${descendantId}`;
-    state.update('replies', immutableDescendants => immutableDescendants.withMutations(replies => {
+  return state.withMutations(state => {
-      ancestors.forEach(status => importStatus(state, status));
+    importStatus(state, { id: tombstoneId, in_reply_to_id: ancestorId });
+    importStatus(state, { id: descendantId, in_reply_to_id: tombstoneId });
+  });
+};
+
+const normalizeContext = (state, id, ancestors, descendants) => state.withMutations(state => {
+  importStatuses(state, ancestors);
 
   descendants.forEach(status => {
     if (status.in_reply_to_id) {
       importStatus(state, status);
     } else {
-          importStatus(state, { id: `tombstone-${status.id}`, in_reply_to_id: id });
+      insertTombstone(state, id, status.id);
-          importStatus(state, { id: status.id, in_reply_to_id: `tombstone-${status.id}` });
     }
   });
 
-      if (ancestors.length > 0 && !inReplyTos.get(id)) {
+  if (ancestors.length > 0 && !state.getIn(['inReplyTos', id])) {
-        const { id: lastId } = ancestors[ancestors.length - 1];
+    insertTombstone(state, ancestors[ancestors.length - 1].id, id);
-        replies.update(`tombstone-${id}`, ImmutableOrderedSet(), siblings => siblings.add(id).sort());
-        replies.update(lastId, ImmutableOrderedSet(), siblings => siblings.add(`tombstone-${id}`).sort());
-        inReplyTos.set(id, `tombstone-${id}`);
-        inReplyTos.set(`tombstone-${id}`, lastId);
   }
-    }));
-  }));
 });
 
-const deleteFromContexts = (immutableState, ids) => immutableState.withMutations(state => {
+const deleteStatus = (state, id) => {
-  state.update('inReplyTos', immutableAncestors => immutableAncestors.withMutations(inReplyTos => {
+  return state.withMutations(state => {
-    state.update('replies', immutableDescendants => immutableDescendants.withMutations(replies => {
+    const parentId = state.getIn(['inReplyTos', id]);
-      ids.forEach(id => {
+    const replies = state.getIn(['replies', id], ImmutableOrderedSet());
-        const inReplyToIdOfId = inReplyTos.get(id);
-        const repliesOfId = replies.get(id);
-        const siblings = replies.get(inReplyToIdOfId);
 
-        if (siblings) {
+    // Delete from its parent's tree
-          replies.set(inReplyToIdOfId, siblings.filterNot(sibling => sibling === id));
+    state.updateIn(['replies', parentId], ImmutableOrderedSet(), ids => ids.delete(id));
-        }
 
+    // Dereference children
+    replies.forEach(reply => state.deleteIn(['inReplyTos', reply]));
 
-        if (repliesOfId) {
+    state.deleteIn(['inReplyTos', id]);
-          repliesOfId.forEach(reply => inReplyTos.delete(reply));
+    state.deleteIn(['replies', id]);
-        }
-
-        inReplyTos.delete(id);
-        replies.delete(id);
   });
-    }));
+};
-  }));
+
-});
+const deleteStatuses = (state, ids) => {
+  return state.withMutations(state => {
+    ids.forEach(id => deleteStatus(state, id));
+  });
+};
 
 const filterContexts = (state, relationship, statuses) => {
   const ownedStatusIds = statuses
     .filter(status => status.get('account') === relationship.id)
     .map(status => status.get('id'));
 
-  return deleteFromContexts(state, ownedStatusIds);
+  return deleteStatuses(state, ownedStatusIds);
 };
 
 export default function replies(state = initialState, action) {
@@ -95,7 +92,7 @@ export default function replies(state = initialState, action) {
   case CONTEXT_FETCH_SUCCESS:
     return normalizeContext(state, action.id, action.ancestors, action.descendants);
   case TIMELINE_DELETE:
-    return deleteFromContexts(state, [action.id]);
+    return deleteStatuses(state, [action.id]);
   case STATUS_IMPORT:
     return importStatus(state, action.status);
   case STATUSES_IMPORT: