matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-28 05:03:59 +03:00
Code Activity

move error handling to caller

Browse Source
This commit is contained in:
Bruno Windels
2018-07-19 15:04:05 +02:00
parent 6061deac37
commit d95d44dc94
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client.js
View File

@@ -762,13 +762,13 @@ MatrixClient.prototype.getRoom = function(roomId) {
* in case lazy loading of memberships is in use. * in case lazy loading of memberships is in use.
* @param {string} roomId The room ID * @param {string} roomId The room ID
*/ */
MatrixClient.prototype.loadRoomMembersIfNeeded = function(roomId) { MatrixClient.prototype.loadRoomMembersIfNeeded = async function(roomId) {
const room = this.getRoom(roomId); const room = this.getRoom(roomId);
if (!room || !room.membersNeedLoading()) { if (!room || !room.membersNeedLoading()) {
return; return;
} }
const membersPromise = this.joinedMembers(roomId); const membersPromise = this.joinedMembers(roomId);
room.setLazilyLoadedMembers(membersPromise); await room.setLazilyLoadedMembers(membersPromise);
}; };
/** /**

6
src/models/room.js
View File

@@ -234,12 +234,8 @@ Room.prototype.setLazilyLoadedMembers = async function(joinedMembersPromise) {
try { try {
members = await joinedMembersPromise; members = await joinedMembersPromise;
} catch (err) { } catch (err) {
const errorMessage = `Fetching room members for ${this.roomId} failed.` +
" Room members will appear incomplete.";
console.error(errorMessage);
console.error(err);
this._membersNeedLoading = true; this._membersNeedLoading = true;
return; throw err; //rethrow so calling code is aware operation failed
} }
this._timelineSets.forEach((tlSet) => tlSet.setJoinedMembers(members.joined)); this._timelineSets.forEach((tlSet) => tlSet.setJoinedMembers(members.joined));
this.emit('Room', this); this.emit('Room', this);