Change detailed status child ordering to sort self-replies on top (#11686)

Fixes #11679

app/javascript/mastodon/features/status/index.js

@@ -84,9 +84,9 @@ const makeMapStateToProps = () => {
   const getDescendantsIds = createSelector([
     (_, { id }) => id,
     state => state.getIn(['contexts', 'replies']),
-  ], (statusId, contextReplies) => {
+    state => state.get('statuses'),
-    let descendantsIds = Immutable.List();
+  ], (statusId, contextReplies, statuses) => {
-    descendantsIds = descendantsIds.withMutations(mutable => {
+    let descendantsIds = [];
     const ids = [statusId];
 
     while (ids.length > 0) {
@@ -94,7 +94,7 @@ const makeMapStateToProps = () => {
       const replies = contextReplies.get(id);
 
       if (statusId !== id) {
-          mutable.push(id);
+        descendantsIds.push(id);
       }
 
       if (replies) {
@@ -103,9 +103,19 @@ const makeMapStateToProps = () => {
         });
       }
     }
+
+    let insertAt = descendantsIds.findIndex((id) => statuses.get(id).get('in_reply_to_account_id') !== statuses.get(id).get('account'));
+    if (insertAt !== -1) {
+      descendantsIds.forEach((id, idx) => {
+        if (idx > insertAt && statuses.get(id).get('in_reply_to_account_id') === statuses.get(id).get('account')) {
+          descendantsIds.splice(idx, 1);
+          descendantsIds.splice(insertAt, 0, id);
+          insertAt += 1;
+        }
       });
+    }
 
-    return descendantsIds;
+    return Immutable.List(descendantsIds);
   });
 
   const mapStateToProps = (state, props) => {