From 330ce0f02e31a7be7195624718fb3caf5ad1d11a Mon Sep 17 00:00:00 2001
From: lukebarnard <luke.barnard99@gmail.com>
Date: Mon, 5 Feb 2018 17:29:22 +0000
Subject: [PATCH] On failure, regenerate state from sdk

Instead of using history, which could be unpredictable
---
 src/stores/RoomListStore.js | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 69d957f074..e48eacaa6a 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -26,7 +26,6 @@ class RoomListStore extends Store {
         super(dis);
 
         this._init();
-        this._actionHistory = [];
     }
 
     _init() {
@@ -57,14 +56,13 @@ class RoomListStore extends Store {
                     break;
                 }
 
-                this._generateRoomLists(payload.matrixClient);
-                this._actionHistory.unshift(payload);
+                this._matrixClient = payload.matrixClient;
+                this._generateRoomLists();
             }
             break;
             case 'MatrixActions.Room.tags': {
                 if (!this._state.ready) break;
                 this._updateRoomLists(payload.room);
-                this._actionHistory.unshift(payload);
             }
             break;
             case 'RoomListActions.tagRoom.pending': {
@@ -74,35 +72,22 @@ class RoomListStore extends Store {
                     payload.request.newTag,
                     payload.request.metaData,
                 );
-                this._actionHistory.unshift(payload);
             }
             break;
             case 'RoomListActions.tagRoom.failure': {
-                this._actionHistory = this._actionHistory.filter((action) => {
-                    return action.asyncId !== payload.asyncId;
-                });
-
-                // don't duplicate history
-                const history = this._actionHistory.slice(0);
-                this._actionHistory = [];
-                this._reloadFromHistory(history);
+                // Reset state according to js-sdk
+                this._generateRoomLists();
             }
             break;
             case 'on_logged_out': {
                 // Reset state without pushing an update to the view, which generally assumes that
                 // the matrix client isn't `null` and so causing a re-render will cause NPEs.
                 this._init();
-                this._actionHistory.unshift(payload);
             }
             break;
         }
     }
 
-    _reloadFromHistory(history) {
-        this._init();
-        history.forEach((action) => this.__onDispatch(action));
-    }
-
     _updateRoomListsOptimistic(updatedRoom, oldTag, newTag, metaData) {
         const newLists = {};
 
@@ -153,7 +138,7 @@ class RoomListStore extends Store {
         });
     }
 
-    _generateRoomLists(matrixClient) {
+    _generateRoomLists() {
         const lists = {
             "im.vector.fake.invite": [],
             "m.favourite": [],
@@ -163,10 +148,14 @@ class RoomListStore extends Store {
             "im.vector.fake.archived": [],
         };
 
+
         const dmRoomMap = DMRoomMap.shared();
 
-        matrixClient.getRooms().forEach((room, index) => {
-            const me = room.getMember(matrixClient.credentials.userId);
+        // If somehow we dispatched a RoomListActions.tagRoom.failure before a MatrixActions.sync
+        if (!this._matrixClient) return;
+
+        this._matrixClient.getRooms().forEach((room, index) => {
+            const me = room.getMember(this._matrixClient.credentials.userId);
             if (!me) return;
 
             if (me.membership == "invite") {