From 3020c8cd94a08210070a7633bfa35a93a049c367 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Wed, 14 Feb 2018 11:23:29 +0000
Subject: [PATCH] Fix custom tags not being ordered manually

Actually fixes vector-im/riot-web#6135 unlike #1748, which
incorrectly assumed that custom tags would be included in
listOrders.

This fix makes sure that the `default` case in the `switch`
is actually used.
---
 src/stores/RoomListStore.js | 42 ++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 693275952b..fdd9ca6692 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -160,32 +160,26 @@ class RoomListStore extends Store {
         });
 
         const listOrders = {
-            "manual": [
-                "m.favourite",
-            ],
-            "recent": [
-                "im.vector.fake.invite",
-                "im.vector.fake.recent",
-                "im.vector.fake.direct",
-                "m.lowpriority",
-                "im.vector.fake.archived",
-            ],
+            "m.favourite": "manual",
+            "im.vector.fake.invite": "recent",
+            "im.vector.fake.recent": "recent",
+            "im.vector.fake.direct": "recent",
+            "m.lowpriority": "recent",
+            "im.vector.fake.archived": "recent",
         };
 
-        Object.keys(listOrders).forEach((order) => {
-            listOrders[order].forEach((listKey) => {
-                let comparator;
-                switch (order) {
-                    case "recent":
-                        comparator = this._recentsComparator;
-                        break;
-                    case "manual":
-                    default:
-                        comparator = this._getManualComparator(listKey, optimisticRequest);
-                        break;
-                }
-                lists[listKey].sort(comparator);
-            });
+        Object.keys(lists).forEach((listKey) => {
+            let comparator;
+            switch (listOrders[listKey]) {
+                case "recent":
+                    comparator = this._recentsComparator;
+                    break;
+                case "manual":
+                default:
+                    comparator = this._getManualComparator(listKey, optimisticRequest);
+                    break;
+            }
+            lists[listKey].sort(comparator);
         });
 
         this._setState({