imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

On failure, regenerate state from sdk

Browse source 
Instead of using history, which could be unpredictable
This commit is contained in:
lukebarnard 2018-02-05 17:29:22 +00:00
parent 81eca49266
commit 330ce0f02e
1 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/stores/RoomListStore.js
View file

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