diff --git a/package-lock.json b/package-lock.json index bac72bbf6b79376a3325e696355861b0b897ed4b..29258a4663bbce1aa0c33fead6966152c1d82ae4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -205,7 +205,7 @@ }, "async": { "version": "0.2.10", - "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", + "resolved": "http://registry.npmjs.org/async/-/async-0.2.10.tgz", "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" }, "async-limiter": { @@ -1150,7 +1150,7 @@ }, "finalhandler": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", + "resolved": "http://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", "requires": { "debug": "2.6.9", @@ -1366,7 +1366,7 @@ }, "http-errors": { "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "requires": { "depd": "~1.1.2", @@ -1839,7 +1839,7 @@ "dependencies": { "bluebird": { "version": "2.11.0", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", + "resolved": "http://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=" } } @@ -1864,7 +1864,7 @@ }, "media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "resolved": "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, "merge-descriptors": { diff --git a/src/db/userstore.ts b/src/db/userstore.ts index 119931fcc616fbe9145b160011b338ccf6228997..c2f732d712cee2f92015238955d759ac73722604 100644 --- a/src/db/userstore.ts +++ b/src/db/userstore.ts @@ -105,7 +105,7 @@ avatarurl_mxc = $avatarurl_mxc WHERE remote_id = $remote_id`, (await this.db.All( "SELECT guild_id, nick FROM remote_user_guild_nicks WHERE remote_id = $remoteId", {remoteId: user.id}, - )).forEach(({g, n}) => existingNicks[g as string] = n); + )).forEach(({guild_id, nick}) => existingNicks[guild_id as string] = nick); for (const guildId of user.guildNicks.keys()) { const nick = user.guildNicks.get(guildId) || null; if (existingData) { diff --git a/src/usersyncroniser.ts b/src/usersyncroniser.ts index 77428d2bc814bd795031d6a65a2ea3be6abe8f14..f10b98310f808613771a81b7daab28e8d63df87a 100644 --- a/src/usersyncroniser.ts +++ b/src/usersyncroniser.ts @@ -379,13 +379,17 @@ export class UserSyncroniser { if (guild.members.has(id)) { log.info(`Updating user ${id} in guild ${guild.id}.`); const member = guild.members.get(id); - const state = await this.GetUserStateForGuildMember(member!); - const rooms = await this.discord.GetRoomIdsFromGuild(guild, member!); - await Promise.all( - rooms.map( - async (roomId) => this.ApplyStateToRoom(state, roomId, guild.id), - ), - ); + try { + const state = await this.GetUserStateForGuildMember(member!); + const rooms = await this.discord.GetRoomIdsFromGuild(guild, member!); + await Promise.all( + rooms.map( + async (roomId) => this.ApplyStateToRoom(state, roomId, guild.id), + ), + ); + } catch (err) { + log.warn(`Failed to update user ${id} in guild ${guild.id}`, err); + } } }); }