Merge branch 'main' into axsuarez/SupportUpdateAndDeleteFromSkills

axelsrz · web-flow · commit e2a5f77c2946 · 2020-10-19T17:38:46.000-07:00
diff --git a/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_extensions.py b/libraries/botbuilder-core/botbuilder/core/teams/teams_activity_extensions.py
@@ -27,7 +27,9 @@ def teams_get_team_info(activity: Activity) -> TeamInfo:
     return None
 
 
-def teams_notify_user(activity: Activity):
+def teams_notify_user(
+    activity: Activity, alert_in_meeting: bool = None, external_resource_url: str = None
+):
     if not activity:
         return
 
@@ -36,4 +38,6 @@ def teams_notify_user(activity: Activity):
 
     channel_data = TeamsChannelData().deserialize(activity.channel_data)
     channel_data.notification = NotificationInfo(alert=True)
+    channel_data.notification.alert_in_meeting = alert_in_meeting
+    channel_data.notification.external_resource_url = external_resource_url
     activity.channel_data = channel_data
diff --git a/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py b/libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py
@@ -940,11 +940,22 @@ class NotificationInfo(Model):
 
     _attribute_map = {
         "alert": {"key": "alert", "type": "bool"},
+        "alert_in_meeting": {"key": "alertInMeeting", "type": "bool"},
+        "external_resource_url": {"key": "externalResourceUrl", "type": "str"},
     }
 
-    def __init__(self, *, alert: bool = None, **kwargs) -> None:
+    def __init__(
+        self,
+        *,
+        alert: bool = None,
+        alert_in_meeting: bool = None,
+        external_resource_url: str = None,
+        **kwargs
+    ) -> None:
         super(NotificationInfo, self).__init__(**kwargs)
         self.alert = alert
+        self.alert_in_meeting = alert_in_meeting
+        self.external_resource_url = external_resource_url
 
 
 class O365ConnectorCard(Model):
