about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/status
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-11-30 12:17:56 +0100
committerThibG <thib@sitedethib.com>2018-11-30 22:37:38 +0100
commit1624a95b2b612ff32408f9c991938a0949cd12b3 (patch)
tree401c8c1675987c29a9cbfb829159a77862f9bd66 /app/javascript/flavours/glitch/features/status
parentb65daa25faab0fbefd367b3cbbe4d32bfd8c5820 (diff)
[Glitch] Introduce flat layout to contexts reducer
Port 023fe5181b66ba2cbd20cca4e3bd34f132deba52 to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/features/status')
-rw-r--r--app/javascript/flavours/glitch/features/status/index.js51
1 files changed, 44 insertions, 7 deletions
diff --git a/app/javascript/flavours/glitch/features/status/index.js b/app/javascript/flavours/glitch/features/status/index.js
index 61de148e1..2ce6a9281 100644
--- a/app/javascript/flavours/glitch/features/status/index.js
+++ b/app/javascript/flavours/glitch/features/status/index.js
@@ -1,3 +1,4 @@
+import Immutable from 'immutable';
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
@@ -57,13 +58,49 @@ const messages = defineMessages({
 const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
 
-  const mapStateToProps = (state, props) => ({
-    status: getStatus(state, { id: props.params.statusId }),
-    settings: state.get('local_settings'),
-    ancestorsIds: state.getIn(['contexts', 'ancestors', props.params.statusId]),
-    descendantsIds: state.getIn(['contexts', 'descendants', props.params.statusId]),
-    askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0,
-  });
+  const mapStateToProps = (state, props) => {
+    const status = getStatus(state, { id: props.params.statusId });
+    let ancestorsIds = Immutable.List();
+    let descendantsIds = Immutable.List();
+
+    if (status) {
+      ancestorsIds = ancestorsIds.withMutations(mutable => {
+        function addAncestor(id) {
+          if (id) {
+            const inReplyTo = state.getIn(['contexts', 'inReplyTos', id]);
+
+            mutable.unshift(id);
+            addAncestor(inReplyTo);
+          }
+        }
+
+        addAncestor(status.get('in_reply_to_id'));
+      });
+
+      descendantsIds = descendantsIds.withMutations(mutable => {
+        function addDescendantOf(id) {
+          const replies = state.getIn(['contexts', 'replies', id]);
+
+          if (replies) {
+            replies.forEach(reply => {
+              mutable.push(reply);
+              addDescendantOf(reply);
+            });
+          }
+        }
+
+        addDescendantOf(status.get('id'));
+      });
+    }
+
+    return {
+      status,
+      ancestorsIds,
+      descendantsIds,
+      settings: state.get('local_settings'),
+      askReplyConfirmation: state.getIn(['compose', 'text']).trim().length !== 0,
+    };
+  };
 
   return mapStateToProps;
 };