diff --git a/src/bot.ts b/src/bot.ts index 240ab20a72cd7ca8be5937de194bdb230f507617..4bfb33313dd10d66f16398c2ef96294d7b4e721b 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -331,15 +331,15 @@ export class DiscordBot { return false; } - public GetDiscordUserOrMember(userId: Discord.Snowflake, guildId?: Discord.Snowflake) - : Promise<Discord.User|Discord.GuildMember> { + public GetDiscordUserOrMember( + userId: Discord.Snowflake, guildId?: Discord.Snowflake, + ): Promise<Discord.User|Discord.GuildMember> { try { if (guildId && this.bot.guilds.has(guildId)) { return this.bot.guilds.get(guildId).fetchMember(userId); } return this.bot.fetchUser(userId); - } - catch (ex) { + } catch (ex) { log.warn(`Could not fetch user data for ${userId} (guild: ${guildId})`); return undefined; } diff --git a/src/matrixeventprocessor.ts b/src/matrixeventprocessor.ts index 90765e7fa10475a6cde5e2d0552fcae43ac75aee..52914b8c1fbce03ecd77ece6d53ca0191506e65d 100644 --- a/src/matrixeventprocessor.ts +++ b/src/matrixeventprocessor.ts @@ -258,13 +258,13 @@ export class MatrixEventProcessor { if (userOrMember instanceof Discord.User) { embed.setAuthor( userOrMember.username, - userOrMember.avatarURL + userOrMember.avatarURL, ); return; } else if (userOrMember instanceof Discord.GuildMember) { embed.setAuthor( userOrMember.displayName, - userOrMember.user.avatarURL + userOrMember.user.avatarURL, ); return; } diff --git a/test/test_matrixeventprocessor.ts b/test/test_matrixeventprocessor.ts index f08e8c959f26adfdbe25e5a05d6963a2ce14989e..10a75725b9688a53562d9eb24f5d59515bb21359 100644 --- a/test/test_matrixeventprocessor.ts +++ b/test/test_matrixeventprocessor.ts @@ -48,7 +48,7 @@ function createMatrixEventProcessor getBot: () => { return { isRemoteUser: () => false, - } + }; }, getIntent: () => { return { @@ -123,7 +123,7 @@ This is the first reply`, new MatrixEventProcessorOpts( config, bridge, - null + null, )); } const mockChannel = new MockChannel();