Skip to content

Commit 9a12226

Browse files
DanielabomDanielabom
authored
Merge branch 'main' into syprieur/meExtensionsMsa
2 parents 8f870d7 + 15efc3a commit 9a12226

24 files changed

+575
-28
lines changed

‎api-reference/beta/api/chatmessage-get.md

Lines changed: 98 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Don't supply a request body for this method.
7373

7474
## Response
7575

76-
If successful, this method returns a `200 OK` response code and a [chatmessage](../resources/chatmessage.md) object in the response body.
76+
If successful, this method returns a `200 OK` response code and a [chatMessage](../resources/chatmessage.md) object in the response body.
7777

7878
## Examples
7979

@@ -589,7 +589,7 @@ GET https://graph.microsoft.com/beta/chats/19:80a7ff67c0ef43c19d88a7638be436b1@t
589589

590590
#### Response
591591

592-
The following example shows the response. The message body contains an @mention for everyone in a group chat that is represented by the `<at></at>` tag. The **conversationIdentityType** property is set to `chat` in the **conversation** identity of the **mentioned** object.
592+
The following example shows the response. The message body contains `<at></at>` tags for each @mention of everyone in a group chat. The **conversationIdentityType** property is set to `chat` in the **conversation** identity of the **mentioned** object.
593593

594594
<!-- {
595595
"blockType": "response",
@@ -777,6 +777,102 @@ Content-type: application/json
777777
}
778778
```
779779

780+
### Example 7: Get a chat message with a Microsoft Loop component
781+
782+
The following example shows a request that gets a chat message that has a Loop component as two attachments.
783+
784+
#### Request
785+
786+
The following example shows a request.
787+
788+
<!-- {
789+
"blockType": "request",
790+
"name": "get_chatmessage_7",
791+
"sampleKeys": ["19:e2ed97baac8e4bffbb91299a38996790@thread.v2", "1732043970539"]
792+
}-->
793+
```msgraph-interactive
794+
GET https://graph.microsoft.com/beta/chats/19:e2ed97baac8e4bffbb91299a38996790@thread.v2/messages/1732043970539
795+
```
796+
797+
798+
799+
#### Response
800+
801+
The following example shows the response. The message body contains two attachments. The value of the **contentType** property of the Loop component is `application/vnd.microsoft.card.fluidEmbedCard`, and the value of the **contentType** property of the placeholder card is `application/vnd.microsoft.card.codesnippet`.
802+
803+
> **Note** - The **contentUrl** and **content** properties for a placeholder card don't have values.
804+
805+
<!-- {
806+
"blockType": "response",
807+
"truncated": true,
808+
"@odata.type": "microsoft.graph.chatMessage"
809+
} -->
810+
811+
```http
812+
HTTP/1.1 200 OK
813+
Content-type: application/json
814+
815+
{
816+
"@odata.context": "https://graph.microsoft.com/beta/$metadata#chats('19%3Ae2ed97baac8e4bffbb91299a38996790%40thread.v2')/messages/$entity",
817+
"@microsoft.graph.tips": "Use $select to choose only the properties your app needs, as this can lead to performance improvements. For example: GET chats('<key>')/messages('<key>')?$select=attachments,body",
818+
"id": "1732043970539",
819+
"replyToId": null,
820+
"etag": "1732043970539",
821+
"messageType": "message",
822+
"createdDateTime": "2024-11-19T19:19:30.539Z",
823+
"lastModifiedDateTime": "2024-11-19T19:19:30.539Z",
824+
"lastEditedDateTime": null,
825+
"deletedDateTime": null,
826+
"subject": null,
827+
"summary": null,
828+
"chatId": "19:e2ed97baac8e4bffbb91299a38996790@thread.v2",
829+
"importance": "normal",
830+
"locale": "en-us",
831+
"webUrl": null,
832+
"channelIdentity": null,
833+
"onBehalfOf": null,
834+
"policyViolation": null,
835+
"eventDetail": null,
836+
"from": {
837+
"application": null,
838+
"device": null,
839+
"user": {
840+
"@odata.type": "#microsoft.graph.teamworkUserIdentity",
841+
"id": "28c10244-4bad-4fda-993c-f332faef94f0",
842+
"displayName": null,
843+
"userIdentityType": "aadUser",
844+
"tenantId": "2432b57b-0abd-43db-aa7b-16eadd115d34"
845+
}
846+
},
847+
"body": {
848+
"contentType": "html",
849+
"content": "<attachment id=\"placeholderCard\"></attachment><span style=\"display:none\"></span><attachment id=\"b21e256a-8581-45cf-ae05-8bb998360bcc\"></attachment>"
850+
},
851+
"attachments": [
852+
{
853+
"id": "b21e256a-8581-45cf-ae05-8bb998360bcc",
854+
"contentType": "application/vnd.microsoft.card.fluidEmbedCard",
855+
"contentUrl": null,
856+
"content": "{\r\n \"componentUrl\": \"https://teamsgraph-my.sharepoint.com/:fl:/g/personal/sumanac_teamsgraph_onmicrosoft_com/EQnofOQM0MpOoDaRIvw-pS8Bfsj_WDFuanBBXnjDAD-w3g?nav=cz0lMkZwZXJzb25hbCUyRnN1bWFuYWNfdGVhbXNncmFwaF9vbm1pY3Jvc29mdF9jb20mZD1iIWVUcmxYX19jN2t5eW9GSFhJdG8yTDI4bmtnV2EtOXhEa244SVBOdGZFYnlxandPblkwdE9TcFVldkh6dWtBV1ImZj0wMUU2TzQ0WFlKNUI2T0lER1FaSkhLQU5VUkVMNkQ1SkpQJmM9JTJGJmZsdWlkPTEmYT1UZWFtcyZwPSU0MGZsdWlkeCUyRmxvb3AtcGFnZS1jb250YWluZXI%3D\",\r\n \"sourceType\": \"Compose\"\r\n}",
857+
"name": null,
858+
"thumbnailUrl": null,
859+
"teamsAppId": "FluidEmbedCard"
860+
},
861+
{
862+
"id": "placeholderCard",
863+
"contentType": "application/vnd.microsoft.card.codesnippet",
864+
"contentUrl": null,
865+
"content": "{}",
866+
"name": null,
867+
"thumbnailUrl": null,
868+
"teamsAppId": "FLUID_PLACEHOLDER_CARD"
869+
}
870+
],
871+
"mentions": [],
872+
"reactions": []
873+
}
874+
```
875+
780876
## Related content
781877

782878
- [List messages in a channel](channel-list-messages.md)

‎api-reference/beta/api/subscription-delete.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Depending on the resource and the permission type (delegated or application) req
2929
3030
| Supported resource | Delegated (work or school account) | Delegated (personal Microsoft account) | Application |
3131
|:-----|:-----|:-----|:-----|
32+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/users/{userId}/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions that a particular user is part of. | AiEnterpriseInteraction.Read | Not supported. | AiEnterpriseInteraction.Read.All, AiEnterpriseInteraction.Read.User |
33+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions in an organization. | Not supported. | Not supported. | AiEnterpriseInteraction.Read.All |
3234
|[approvalItems](../resources/approvalItem.md) | Not supported. | Not supported. | ApprovalSolution.ReadWrite.All |
3335
|[callRecord](../resources/callrecords-callrecord.md) | Not supported. | Not supported. | CallRecords.Read.All |
3436
|[callRecording](../resources/callrecording.md) <br /> `communications/onlineMeetings/getAllRecordings` <br /> Any recording becomes available in the tenant. | Not supported. | Not supported. | OnlineMeetingRecording.Read.All |
@@ -92,9 +94,13 @@ Depending on the resource and the permission type (delegated or application) req
9294
> - Chat.Manage.Chat
9395
> - ChannelMessage.Read.Group
9496
> - ChatMember.Read.Chat
97+
> - AiEnterpriseInteraction.Read.User
9598
9699
[!INCLUDE [teams-subscription-notes](../../includes/teams-subscription-notes.md)]
97100

101+
<!-- ### aiInteraction -->
102+
[!INCLUDE [copilot-aiinteraction-subscription-notes.md](../../includes/copilot-aiinteraction-subscription-notes.md)]
103+
98104
### driveItem
99105

100106
More limitations apply to subscriptions on OneDrive items. The limitations apply to creating as well as managing (getting, updating, and deleting) subscriptions.

‎api-reference/beta/api/subscription-get.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Depending on the resource and the permission type (delegated or application) req
2929
3030
| Supported resource | Delegated (work or school account) | Delegated (personal Microsoft account) | Application |
3131
|:-----|:-----|:-----|:-----|
32+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/users/{userId}/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions that a particular user is part of. | AiEnterpriseInteraction.Read | Not supported. | AiEnterpriseInteraction.Read.All, AiEnterpriseInteraction.Read.User |
33+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions in an organization. | Not supported. | Not supported. | AiEnterpriseInteraction.Read.All |
3234
|[approvalItems](../resources/approvalItem.md) | Not supported. | Not supported. | ApprovalSolution.ReadWrite.All |
3335
|[callRecord](../resources/callrecords-callrecord.md) | Not supported. | Not supported. | CallRecords.Read.All |
3436
|[callRecording](../resources/callrecording.md) <br /> `communications/onlineMeetings/getAllRecordings` <br /> Any recording becomes available in the tenant. | Not supported. | Not supported. | OnlineMeetingRecording.Read.All |
@@ -92,9 +94,13 @@ Depending on the resource and the permission type (delegated or application) req
9294
> - Chat.Manage.Chat
9395
> - ChannelMessage.Read.Group
9496
> - ChatMember.Read.Chat
97+
> - AiEnterpriseInteraction.Read.User
9598
9699
[!INCLUDE [teams-subscription-notes](../../includes/teams-subscription-notes.md)]
97100

101+
<!-- ### aiInteraction -->
102+
[!INCLUDE [copilot-aiinteraction-subscription-notes.md](../../includes/copilot-aiinteraction-subscription-notes.md)]
103+
98104
### driveItem
99105

100106
More limitations apply to subscriptions on OneDrive items. The limitations apply to creating as well as managing (getting, updating, and deleting) subscriptions.

‎api-reference/beta/api/subscription-list.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Depending on the resource and the permission type (delegated or application) req
2929
3030
| Supported resource | Delegated (work or school account) | Delegated (personal Microsoft account) | Application |
3131
|:-----|:-----|:-----|:-----|
32+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/users/{userId}/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions that a particular user is part of. | AiEnterpriseInteraction.Read | Not supported. | AiEnterpriseInteraction.Read.All, AiEnterpriseInteraction.Read.User |
33+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions in an organization. | Not supported. | Not supported. | AiEnterpriseInteraction.Read.All |
3234
|[approvalItems](../resources/approvalItem.md) | Not supported. | Not supported. | ApprovalSolution.ReadWrite.All |
3335
|[callRecord](../resources/callrecords-callrecord.md) | Not supported. | Not supported. | CallRecords.Read.All |
3436
|[callRecording](../resources/callrecording.md) <br /> `communications/onlineMeetings/getAllRecordings` <br /> Any recording becomes available in the tenant. | Not supported. | Not supported. | OnlineMeetingRecording.Read.All |
@@ -91,9 +93,13 @@ Depending on the resource and the permission type (delegated or application) req
9193
> - Chat.Manage.Chat
9294
> - ChannelMessage.Read.Group
9395
> - ChatMember.Read.Chat
96+
> - AiEnterpriseInteraction.Read.User
9497
9598
Response results are based on the context of the calling app. The following sections describe the common scenarios.
9699

100+
<!-- ### aiInteraction -->
101+
[!INCLUDE [copilot-aiinteraction-subscription-notes.md](../../includes/copilot-aiinteraction-subscription-notes.md)]
102+
97103
### Basic scenarios
98104

99105
Most commonly, an application wants to retrieve subscriptions that it originally created for the currently signed-in user or all users in the directory (work/school accounts). These scenarios don't require any special permissions beyond the ones the app used originally to create its subscriptions.

‎api-reference/beta/api/subscription-post-subscriptions.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ Depending on the resource and the permission type (delegated or application) req
3434
3535
| Supported resource | Delegated (work or school account) | Delegated (personal Microsoft account) | Application |
3636
|:-----|:-----|:-----|:-----|
37+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/users/{userId}/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions that a particular user is part of. | AiEnterpriseInteraction.Read | Not supported. | AiEnterpriseInteraction.Read.All, AiEnterpriseInteraction.Read.User |
38+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions in an organization. | Not supported. | Not supported. | AiEnterpriseInteraction.Read.All |
3739
|[approvalItems](../resources/approvalItem.md) | Not supported. | Not supported. | ApprovalSolution.ReadWrite.All |
3840
|[callRecord](../resources/callrecords-callrecord.md) | Not supported. | Not supported. | CallRecords.Read.All |
3941
|[callRecording](../resources/callrecording.md) <br /> `communications/onlineMeetings/getAllRecordings` <br /> Any recording becomes available in the tenant. | Not supported. | Not supported. | OnlineMeetingRecording.Read.All |
@@ -97,9 +99,13 @@ Depending on the resource and the permission type (delegated or application) req
9799
> - Chat.Manage.Chat
98100
> - ChannelMessage.Read.Group
99101
> - ChatMember.Read.Chat
102+
> - AiEnterpriseInteraction.Read.User
100103
101104
[!INCLUDE [teams-subscription-notes](../../includes/teams-subscription-notes.md)]
102105

106+
<!-- ### aiInteraction -->
107+
[!INCLUDE [copilot-aiinteraction-subscription-notes.md](../../includes/copilot-aiinteraction-subscription-notes.md)]
108+
103109
### driveItem
104110

105111
More limitations apply to subscriptions on OneDrive items. The limitations apply to creating as well as managing (getting, updating, and deleting) subscriptions.
@@ -123,7 +129,6 @@ For details about online meeting subscriptions, see [Get change notifications fo
123129

124130
Subscriptions on virtual events support only basic notifications and are limited to a few entities of a virtual event. For more information about the supported subscription types, see [Get change notifications for Microsoft Teams virtual event updates](/graph/changenotifications-for-virtualevent).
125131

126-
127132
## HTTP request
128133

129134
<!-- { "blockType": "ignored" } -->

‎api-reference/beta/api/subscription-reauthorize.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Depending on the resource and the permission type (delegated or application) req
2626
2727
| Supported resource | Delegated (work or school account) | Delegated (personal Microsoft account) | Application |
2828
|:-----|:-----|:-----|:-----|
29+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/users/{userId}/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions that a particular user is part of. | AiEnterpriseInteraction.Read | Not supported. | AiEnterpriseInteraction.Read.All, AiEnterpriseInteraction.Read.User |
30+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions in an organization. | Not supported. | Not supported. | AiEnterpriseInteraction.Read.All |
2931
|[approvals](../resources/approvalitem.md) | Not supported. | Not supported. | ApprovalSolution.ReadWrite.All |
3032
|[callRecord](../resources/callrecords-callrecord.md) | Not supported. | Not supported. | CallRecords.Read.All |
3133
|[callRecording](../resources/callrecording.md) <br /> `communications/onlineMeetings/getAllRecordings` <br /> Any recording becomes available in the tenant. | Not supported. | Not supported. | OnlineMeetingRecording.Read.All |
@@ -88,9 +90,13 @@ Depending on the resource and the permission type (delegated or application) req
8890
> - Chat.Manage.Chat
8991
> - ChannelMessage.Read.Group
9092
> - ChatMember.Read.Chat
93+
> - AiEnterpriseInteraction.Read.User
9194
9295
[!INCLUDE [teams-subscription-notes](../../includes/teams-subscription-notes.md)]
9396

97+
<!-- ### aiInteraction -->
98+
[!INCLUDE [copilot-aiinteraction-subscription-notes.md](../../includes/copilot-aiinteraction-subscription-notes.md)]
99+
94100
## HTTP request
95101

96102
<!-- {

‎api-reference/beta/api/subscription-update.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Depending on the resource and the permission type (delegated or application) req
3131
3232
| Supported resource | Delegated (work or school account) | Delegated (personal Microsoft account) | Application |
3333
|:-----|:-----|:-----|:-----|
34+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/users/{userId}/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions that a particular user is part of. | AiEnterpriseInteraction.Read | Not supported. | AiEnterpriseInteraction.Read.All, AiEnterpriseInteraction.Read.User |
35+
|[aiInteraction](../resources/aiinteraction.md) <br /> `copilot/interactionHistory/getAllEnterpriseInteractions` <br /> Copilot AI interactions in an organization. | Not supported. | Not supported. | AiEnterpriseInteraction.Read.All |
3436
|[approvalItems](../resources/approvalItem.md) | Not supported. | Not supported. | ApprovalSolution.ReadWrite.All |
3537
|[callRecord](../resources/callrecords-callrecord.md) | Not supported. | Not supported. | CallRecords.Read.All |
3638
|[callRecording](../resources/callrecording.md) <br /> `communications/onlineMeetings/getAllRecordings` <br /> Any recording becomes available in the tenant. | Not supported. | Not supported. | OnlineMeetingRecording.Read.All |
@@ -94,9 +96,13 @@ Depending on the resource and the permission type (delegated or application) req
9496
> - Chat.Manage.Chat
9597
> - ChannelMessage.Read.Group
9698
> - ChatMember.Read.Chat
99+
> - AiEnterpriseInteraction.Read.User
97100
98101
[!INCLUDE [teams-subscription-notes](../../includes/teams-subscription-notes.md)]
99102

103+
<!-- ### aiInteraction -->
104+
[!INCLUDE [copilot-aiinteraction-subscription-notes.md](../../includes/copilot-aiinteraction-subscription-notes.md)]
105+
100106
### driveItem
101107

102108
More limitations apply to subscriptions on OneDrive items. The limitations apply to creating as well as managing (getting, updating, and deleting) subscriptions.

‎api-reference/beta/resources/aiinteractionhistory.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ Represents a list of messages exchanged involving AI.
2727
None.
2828

2929
## Relationships
30-
| Relationship | Type | Description |
31-
|:--------------|:---------|:------------|
32-
| interactions | [aiInteraction](../resources/aiinteraction.md) collection| The list of AI interactions. |
33-
30+
None.
3431

3532
## JSON representation
3633

@@ -46,6 +43,6 @@ The following JSON representation shows the resource type.
4643

4744
```json
4845
{
49-
"interactions": [{"@odata.type": "microsoft.graph.aiinteraction"}]
46+
"@odata.type": "#microsoft.graph.aiInteractionHistory"
5047
}
5148
```

‎api-reference/beta/resources/chatmessageattachment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ An entity of type **chatMessageAttachment** is returned as part of the [Get chan
2222
| Property | Type |Description|
2323
|:---------------|:--------|:----------|
2424
|content|string|The content of the attachment. If the attachment is a [rich card](/microsoftteams/platform/task-modules-and-cards/cards/cards-reference), set the property to the rich card object. This property and **contentUrl** are mutually exclusive.|
25-
|contentType| string | The media type of the content attachment. The possible values are: <br><ul><li>`reference`: The attachment is a link to another file. Populate the <b>contentURL</b> with the link to the object.</li><li>`forwardedMessageReference`: The attachment is a reference to a forwarded message. Populate the <b>content</b> with the original message context.</li><li>Any <b>contentType</b> that is supported by the Bot Framework's [Attachment object](/azure/bot-service/rest-api/bot-framework-rest-connector-api-reference?#attachment-object).</li><li>`application/vnd.microsoft.card.codesnippet`: A code snippet. </li><li>`application/vnd.microsoft.card.announcement`: An announcement header. </li>|
25+
|contentType| string | The media type of the content attachment. The possible values are: <br><ul><li>`reference`: The attachment is a link to another file. Populate the <b>contentURL</b> with the link to the object.</li><li>`forwardedMessageReference`: The attachment is a reference to a forwarded message. Populate the <b>content</b> with the original message context.</li><li>Any <b>contentType</b> that is supported by the Bot Framework's [Attachment object](/azure/bot-service/rest-api/bot-framework-rest-connector-api-reference?#attachment-object).</li><li>`application/vnd.microsoft.card.codesnippet`: Either a code snippet or place holder. </li><li>`application/vnd.microsoft.card.announcement`: An announcement header. </li><li>`application/vnd.microsoft.card.fluidEmbedCard`: A Microsoft Loop component. </li>|
2626
|contentUrl|string|The URL for the content of the attachment. |
2727
|id|string| Read-only. The unique ID of the attachment.|
2828
|name|string|Name of the attachment.|

‎api-reference/beta/resources/copilotroot.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ None.
2424
|Relationship|Type|Description|
2525
|:---|:---|:---|
2626
|admin|[copilotAdmin](../resources/copilotadmin.md)|The Microsoft 365 Copilot admin who can add or modify Copilot settings. Read-only. Nullable.|
27+
|interactionHistory|[aiInteractionHistory](../resources/aiinteractionhistory.md)|The history of interactions between AI agents and users.|
2728

2829
## JSON representation
2930
The following JSON representation shows the resource type.

0 commit comments

Comments
 (0)