d2m/converters/message-to-event.js

@@ -175,8 +175,7 @@ async function messageToEvent(message, guild, options = {}, di) {
 				if (!userRegex.some(rx => mxid.match(rx))) {
 					const localpart = mxid.match(/@([^:]*)/)
 					assert(localpart)
-					const displayName = member.displayname || localpart[1]
+					if (writtenMentionsText.includes(localpart[1].toLowerCase()) || writtenMentionsText.includes(member.display_name.toLowerCase())) addMention(mxid)
-					if (writtenMentionsText.includes(localpart[1].toLowerCase()) || writtenMentionsText.includes(displayName.toLowerCase())) addMention(mxid)
 				}
 			}
 		}

d2m/converters/message-to-event.test.js

@@ -285,19 +285,19 @@ test("message2event: simple written @mentions for matrix users", async t => {
 						resolve({
 							joined: {
 								"@cadence:cadence.moe": {
-									displayname: "cadence [they]",
+									display_name: "cadence [they]",
 									avatar_url: "whatever"
 								},
 								"@huckleton:cadence.moe": {
-									displayname: "huck",
+									display_name: "huck",
 									avatar_url: "whatever"
 								},
 								"@_ooye_botrac4r:cadence.moe": {
-									displayname: "botrac4r",
+									display_name: "botrac4r",
 									avatar_url: "whatever"
 								},
 								"@_ooye_bot:cadence.moe": {
-									displayname: "Out Of Your Element",
+									display_name: "Out Of Your Element",
 									avatar_url: "whatever"
 								}
 							}

d2m/event-dispatcher.js

@@ -168,6 +168,7 @@ module.exports = {
 		const channel = client.channels.get(message.channel_id)
 		if (!channel.guild_id) return // Nothing we can do in direct messages.
 		const guild = client.guilds.get(channel.guild_id)
+		if (!isGuildAllowed(guild.id)) return
 
 		await sendMessage.sendMessage(message, guild),
 		await discordCommandHandler.execute(message, channel, guild)
@@ -194,6 +195,7 @@ module.exports = {
 			const channel = client.channels.get(message.channel_id)
 			if (!channel.guild_id) return // Nothing we can do in direct messages.
 			const guild = client.guilds.get(channel.guild_id)
+			if (!isGuildAllowed(guild.id)) return
 			await editMessage.editMessage(message, guild)
 		}
 	},

types.d.ts

@@ -184,7 +184,7 @@ export namespace R {
 
 	export type RoomMember = {
 		avatar_url: string
-		displayname: string
+		display_name: string
 	}
 
 	export type FileUploaded = {