Merge pull request #1590 from matrix-org/luke/fix-flair-store-2
Fix FlairStore getPublicisedGroupsCached to give the correct, existing promisepull/21833/head
commit
20a16d71b8
|
@ -69,9 +69,13 @@ class FlairStore extends EventEmitter {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bulk lookup ongoing, return promise to resolve/reject
|
// Bulk lookup ongoing, return promise to resolve/reject
|
||||||
if (this._usersPending[userId] || this._usersInFlight[userId]) {
|
if (this._usersPending[userId]) {
|
||||||
return this._usersPending[userId].prom;
|
return this._usersPending[userId].prom;
|
||||||
}
|
}
|
||||||
|
// User has been moved from pending to in-flight
|
||||||
|
if (this._usersInFlight[userId]) {
|
||||||
|
return this._usersInFlight[userId].prom;
|
||||||
|
}
|
||||||
|
|
||||||
this._usersPending[userId] = {};
|
this._usersPending[userId] = {};
|
||||||
this._usersPending[userId].prom = new Promise((resolve, reject) => {
|
this._usersPending[userId].prom = new Promise((resolve, reject) => {
|
||||||
|
|
Loading…
Reference in New Issue