diff --git a/src/matrixmessageprocessor.ts b/src/matrixmessageprocessor.ts index 1b62c84acb750e6b123d91581decd3bddbddefad..c33a19ed2caf14261f1cc30c15cbdaf88a635c1c 100644 --- a/src/matrixmessageprocessor.ts +++ b/src/matrixmessageprocessor.ts @@ -124,7 +124,7 @@ export class MatrixMessageProcessor { const USER_REGEX = /^@_discord_([0-9]*)/; const match = mxid.match(USER_REGEX); const member = match && await guild.members.fetch(match[1]); - if (!match || member) { + if (!match || !member) { return null; } return match[1]; diff --git a/test/mocks/collection.ts b/test/mocks/collection.ts index 7773f4460f6c3fa24c25ea873c5c4ea32175ae9e..65db42431e164da1dc4ada21b468786fc0d36257 100644 --- a/test/mocks/collection.ts +++ b/test/mocks/collection.ts @@ -39,4 +39,8 @@ export class MockCollectionManager<T1, T2> { public resolve(id: T1) { return this.innerCache.get(id); } + + public async fetch(id: T1) { + return this.innerCache.get(id); + } } diff --git a/test/test_matrixmessageprocessor.ts b/test/test_matrixmessageprocessor.ts index 0c5e2b2d15ecbd1afc288240b9bba81b5da96dfc..bcbf78cf85852255376052f42701fe53697dd47c 100644 --- a/test/test_matrixmessageprocessor.ts +++ b/test/test_matrixmessageprocessor.ts @@ -253,7 +253,7 @@ describe("MatrixMessageProcessor", () => { guild.emojis.cache.set("123456", emoji); const msg = getHtmlMessage("<img alt=\"test_emoji\">"); const result = await mp.FormatMessage(msg, guild as any); - expect(result).is.equal("<:test_emoji:123456>"); + expect(result).is.equal("test\\_emoji"); }); it("Inserts emojis by mxc url", async () => { const mp = new MatrixMessageProcessor(bot, config);