diff --git a/src/auto-reply/reply.triggers.test.ts b/src/auto-reply/reply.triggers.test.ts index 191dea728..70836c3dc 100644 --- a/src/auto-reply/reply.triggers.test.ts +++ b/src/auto-reply/reply.triggers.test.ts @@ -276,7 +276,9 @@ describe("trigger handling", () => { From: "discord:123", To: "user:123", Surface: "discord", - SenderName: "steipete", + SenderName: "Peter Steinberger", + SenderUsername: "steipete", + SenderTag: "steipete", }, {}, cfg, diff --git a/src/auto-reply/reply.ts b/src/auto-reply/reply.ts index b2257b5e9..6f3935b90 100644 --- a/src/auto-reply/reply.ts +++ b/src/auto-reply/reply.ts @@ -155,6 +155,8 @@ function isApprovedElevatedSender(params: { }; addToken(params.ctx.SenderName); + addToken(params.ctx.SenderUsername); + addToken(params.ctx.SenderTag); addToken(params.ctx.SenderE164); addToken(params.ctx.From); addToken(stripSenderPrefix(params.ctx.From)); diff --git a/src/auto-reply/templating.ts b/src/auto-reply/templating.ts index 2215a127b..669b753f8 100644 --- a/src/auto-reply/templating.ts +++ b/src/auto-reply/templating.ts @@ -17,6 +17,8 @@ export type MsgContext = { GroupSpace?: string; GroupMembers?: string; SenderName?: string; + SenderUsername?: string; + SenderTag?: string; SenderE164?: string; Surface?: string; WasMentioned?: boolean; diff --git a/src/discord/monitor.ts b/src/discord/monitor.ts index 2912ab651..74b035219 100644 --- a/src/discord/monitor.ts +++ b/src/discord/monitor.ts @@ -461,6 +461,8 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) { : `channel:${message.channelId}`, ChatType: isDirectMessage ? "direct" : "group", SenderName: message.member?.displayName ?? message.author.tag, + SenderUsername: message.author.username, + SenderTag: message.author.tag, GroupSubject: groupSubject, GroupRoom: groupRoom, GroupSpace: isGuildMessage ? guildSlug || undefined : undefined,