From f29b97e08756700f20dcf35eaa41b36cb89fbaa7 Mon Sep 17 00:00:00 2001 From: Ben Brougher Date: Fri, 10 Jun 2022 09:09:38 -0700 Subject: [PATCH 1/2] Add direct_mention support to webex adapter --- packages/botbuilder-adapter-webex/src/webex_adapter.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/botbuilder-adapter-webex/src/webex_adapter.ts b/packages/botbuilder-adapter-webex/src/webex_adapter.ts index fc256301a..00664d761 100644 --- a/packages/botbuilder-adapter-webex/src/webex_adapter.ts +++ b/packages/botbuilder-adapter-webex/src/webex_adapter.ts @@ -506,6 +506,9 @@ export class WebexAdapter extends BotAdapter { if (activity.from.id === this.identity.id) { activity.channelData.botkitEventType = 'self_message'; activity.type = ActivityTypes.Event; + } else if(activity.channelData.mentionedPeople.includes(this.identity.id)) { + // this is someone trying to talk to the bot + activity.channelData.botkitEventType = 'direct_mention'; } else { // change the event type of messages sent in 1:1s if (activity.channelData.roomType === 'direct') { From 8b3475f57a0eab2da02e875a04f78a8188d27434 Mon Sep 17 00:00:00 2001 From: Ben Brougher Date: Fri, 10 Jun 2022 09:41:10 -0700 Subject: [PATCH 2/2] Handle situation where mentionedPeople is null in check for direct_message --- packages/botbuilder-adapter-webex/src/webex_adapter.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/botbuilder-adapter-webex/src/webex_adapter.ts b/packages/botbuilder-adapter-webex/src/webex_adapter.ts index 00664d761..831f1049a 100644 --- a/packages/botbuilder-adapter-webex/src/webex_adapter.ts +++ b/packages/botbuilder-adapter-webex/src/webex_adapter.ts @@ -506,7 +506,8 @@ export class WebexAdapter extends BotAdapter { if (activity.from.id === this.identity.id) { activity.channelData.botkitEventType = 'self_message'; activity.type = ActivityTypes.Event; - } else if(activity.channelData.mentionedPeople.includes(this.identity.id)) { + } else if (activity.channelData.mentionedPeople && + activity.channelData.mentionedPeople.includes(this.identity.id)) { // this is someone trying to talk to the bot activity.channelData.botkitEventType = 'direct_mention'; } else {