Skip to content

Commit f9ecb90

Browse files
authored
Merge pull request #23490 from microsoftgraph/main
Merge to publish.
2 parents 50138b5 + 004529a commit f9ecb90

32 files changed

+523
-377
lines changed

api-reference/beta/api/calltranscript-delta.md

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Get a set of [callTranscript](../resources/calltranscript.md) resources that hav
1717

1818
Delta query supports both full synchronization that gets all the transcripts for online meetings organized by a given user, and incremental synchronization that gets transcripts that have been added since the last synchronization. Typically, you would do an initial full synchronization, and then get incremental changes to that transcript view periodically.
1919

20-
2120
A GET request with the delta function returns either:
2221

2322
- A `@odata.nextLink` (that contains a URL with a **delta** function call and a `skipToken`), or
@@ -75,7 +74,7 @@ See also what you'll do in the [next round to get additional transcripts](#examp
7574

7675
#### Initial request
7776

78-
In this example, the call transcripts are being synchronized for the first time, so the initial sync request does not include any state token. This round will return all transcripts available at the time.
77+
In this example, the call transcripts are being synchronized for the first time, so the initial sync request doesn't include any state token. This round returns all transcripts available at the time.
7978

8079
<!-- { "blockType": "ignored" } -->
8180
```http
@@ -89,8 +88,7 @@ The response includes two call transcripts and a `@odata.nextLink` response head
8988
<!-- {
9089
"blockType": "response",
9190
"truncated": true,
92-
"@odata.type": "microsoft.graph.callTranscript",
93-
"isCollection": true
91+
"@odata.type": "Collection(microsoft.graph.callTranscript)"
9492
} -->
9593
```http
9694
HTTP/1.1 200 OK
@@ -99,7 +97,7 @@ Content-type: application/json
9997
{
10098
"@odata.context": "https://graph.microsoft.com/beta/$metadata#Collection(callTranscript)",
10199
"@odata.count": 2,
102-
"@odata.nextLink": "https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeeting/getAllTranscripts?$skiptoken=GGXvkS7mbjFAe9Uidm2D70e58K-BOnoJadAqkZEJmoLprr5eSP1hQPlb3dJ1AVz3xCYKxov6hSEJhsasyg",
100+
"@odata.nextLink": "https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/getAllTranscripts?$skiptoken=GGXvkS7mbjFAe9Uidm2D70e58K-BOnoJadAqkZEJmoLprr5eSP1hQPlb3dJ1AVz3xCYKxov6hSEJhsasyg",
103101
"value":[
104102
{
105103
"@odata.type": "#microsoft.graph.callTranscript",
@@ -128,7 +126,7 @@ The second request specifies the `@odata.nextLink` URL returned from the previou
128126

129127
<!-- { "blockType": "ignored" } -->
130128
```http
131-
GET https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeeting/getAllTranscripts?$skiptoken=GGXvkS7mbjFAe9Uidm2D70e58K-BOnoJadAqkZEJmoLprr5eSP1hQPlb3dJ1AVz3xCYKxov6hSEJhsasyg
129+
GET https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/getAllTranscripts?$skiptoken=GGXvkS7mbjFAe9Uidm2D70e58K-BOnoJadAqkZEJmoLprr5eSP1hQPlb3dJ1AVz3xCYKxov6hSEJhsasyg
132130
```
133131

134132
#### Second response
@@ -138,8 +136,7 @@ The second response returns the next 2 call transcripts and a `@odata.nextLink`
138136
<!-- {
139137
"blockType": "response",
140138
"truncated": true,
141-
"@odata.type": "microsoft.graph.callTranscript",
142-
"isCollection": true
139+
"@odata.type": "Collection(microsoft.graph.callTranscript)"
143140
} -->
144141
```http
145142
HTTP/1.1 200 OK
@@ -148,7 +145,7 @@ Content-type: application/json
148145
{
149146
"@odata.context": "https://graph.microsoft.com/beta/$metadata#Collection(callTranscript)",
150147
"@odata.count": 2,
151-
"@odata.nextLink": "https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeeting/getAllTranscripts?$skiptoken=GGXve9Uidm2D70kS7mbjFAe58K-BOnPlb3dJ1AVz3xCYmoLprr5eSP1hQKxov6hSEJhsasyg",
148+
"@odata.nextLink": "https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/getAllTranscripts?$skiptoken=GGXve9Uidm2D70kS7mbjFAe58K-BOnPlb3dJ1AVz3xCYmoLprr5eSP1hQKxov6hSEJhsasyg",
152149
"value":[
153150
{
154151
"@odata.type": "#microsoft.graph.callTranscript",
@@ -176,7 +173,7 @@ The third request continues to use the latest `@odata.nextLink` returned from th
176173

177174
<!-- { "blockType": "ignored" } -->
178175
```http
179-
GET https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeeting/getAllTranscripts?$skiptoken=GGXve9Uidm2D70kS7mbjFAe58K-BOnPlb3dJ1AVz3xCYmoLprr5eSP1hQKxov6hSEJhsasyg
176+
GET https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/getAllTranscripts?$skiptoken=GGXve9Uidm2D70kS7mbjFAe58K-BOnPlb3dJ1AVz3xCYmoLprr5eSP1hQKxov6hSEJhsasyg
180177
```
181178

182179
#### Third and final response for the round
@@ -186,8 +183,7 @@ The third response returns the only remaining transcripts and a `@odata.deltaLin
186183
<!-- {
187184
"blockType": "response",
188185
"truncated": true,
189-
"@odata.type": "microsoft.graph.callTranscript",
190-
"isCollection": true
186+
"@odata.type": "Collection(microsoft.graph.callTranscript)"
191187
} -->
192188
```http
193189
HTTP/1.1 200 OK
@@ -196,7 +192,7 @@ Content-type: application/json
196192
{
197193
"@odata.context": "https://graph.microsoft.com/beta/$metadata#Collection(callTranscript)",
198194
"@odata.count": 1,
199-
"@odata.deltaLink": "https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeeting/getAllTranscripts?$deltatoken=aQdvS1VwGCSRxVmZJqykmDik_JIC44iCZpv-GLiA2VnFuE5yG-kCEBROb2iaPT_y_eMWVQtBO_ejzzyIxl00ji-tQ3HzAbW4liZAVG88lO3nG_6-MBFoHY1n8y21YUzjocG-Cn1tCNeeLPLTzIe5Dw.EP9gLiCoF2CE_e6l_m1bTk2aokD9KcgfgfcLGqd1r_4",
195+
"@odata.deltaLink": "https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/getAllTranscripts?$deltatoken=aQdvS1VwGCSRxVmZJqykmDik_JIC44iCZpv-GLiA2VnFuE5yG-kCEBROb2iaPT_y_eMWVQtBO_ejzzyIxl00ji-tQ3HzAbW4liZAVG88lO3nG_6-MBFoHY1n8y21YUzjocG-Cn1tCNeeLPLTzIe5Dw.EP9gLiCoF2CE_e6l_m1bTk2aokD9KcgfgfcLGqd1r_4",
200196
"value":[
201197
{
202198
"@odata.type": "#microsoft.graph.callTranscript",
@@ -218,7 +214,7 @@ Using the `@odata.deltaLink` from the last request in the last round, you can ge
218214

219215
<!-- { "blockType": "ignored" } -->
220216
```http
221-
GET https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeeting/getAllTranscripts/delta?$deltatoken=aQdvS1VwGCSRxVmZJqykmDik_JIC44iCZpv-GLiA2VnFuE5yG-kCEBROb2iaPT_y_eMWVQtBO_ejzzyIxl00ji-tQ3HzAbW4liZAVG88lO3nG_6-MBFoHY1n8y21YUzjocG-Cn1tCNeeLPLTzIe5Dw.EP9gLiCoF2CE_e6l_m1bTk2aokD9KcgfgfcLGqd1r_4
217+
GET https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/getAllTranscripts/delta?$deltatoken=aQdvS1VwGCSRxVmZJqykmDik_JIC44iCZpv-GLiA2VnFuE5yG-kCEBROb2iaPT_y_eMWVQtBO_ejzzyIxl00ji-tQ3HzAbW4liZAVG88lO3nG_6-MBFoHY1n8y21YUzjocG-Cn1tCNeeLPLTzIe5Dw.EP9gLiCoF2CE_e6l_m1bTk2aokD9KcgfgfcLGqd1r_4
222218
```
223219
---
224220

@@ -228,25 +224,24 @@ GET https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/
228224
<!-- {
229225
"blockType": "response",
230226
"truncated": true,
231-
"@odata.type": "microsoft.graph.callTranscript",
232-
"isCollection": true
227+
"@odata.type": "Collection(microsoft.graph.callTranscript)"
233228
} -->
234229
```http
235230
HTTP/1.1 200 OK
236231
Content-type: application/json
237232
238233
{
239234
"@odata.context": "https://graph.microsoft.com/beta/$metadata#Collection(callTranscript)",
240-
"@odata.deltaLink": "https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeeting/getAllTranscripts/delta?$deltatoken=aQdvS1VwGCSRxVmZJqykmDik_JIC44iCZpv-GLiA2VnFuE5yG-kCEBROb2iaPT_yjz2nsMoh1gXNtXii7s78HapCi5woifXqwXlVNxICh8wUUnvE2gExsa8eZ2Vy_ch5rVIhm067_1mUPML3iYUVyg.3o0rhgaBUduuxOr98An5pjBDP5JjKUiVWku3flSiOsk",
235+
"@odata.deltaLink": "https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/getAllTranscripts/delta?$deltatoken=aQdvS1VwGCSRxVmZJqykmDik_JIC44iCZpv-GLiA2VnFuE5yG-kCEBROb2iaPT_yjz2nsMoh1gXNtXii7s78HapCi5woifXqwXlVNxICh8wUUnvE2gExsa8eZ2Vy_ch5rVIhm067_1mUPML3iYUVyg.3o0rhgaBUduuxOr98An5pjBDP5JjKUiVWku3flSiOsk",
241236
"value": [
242-
{
237+
{
243238
"@odata.type": "#microsoft.graph.callTranscript",
244239
"meetingId": "MSo4YjA4MWVmNi00NzkyLTRkZWYtYjJjOS1jMzYzYTFiZjQxZDUqMCoqMTk6bWVldGluZ19IMU4xMlgxSTBOekF0Wm1ReU8xQzIxMU5HWTFMV0UwTTJFdFpXTTFOVFkxWW1Rd05HTTBAdGhyZWFkLnYy",
245240
"meetingOrganizerId": "8b081ef6-4792-4def-b2c9-c363a1bf41d5",
246241
"transcriptContentUrl": "https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/MSo4YjA4MWVmNi00NzkyLTRkZWYtYjJjOS1jMzYzYTFiZjQxZDUqMCoqMTk6bWVldGluZ19IMU4xMlgxSTBOekF0Wm1ReU8xQzIxMU5HWTFMV0UwTTJFdFpXTTFOVFkxWW1Rd05HTTBAdGhyZWFkLnYy/transcripts/MSMjMCMjZDMzYWQzM2EtMmVhYS0zM2FjLWJkZWItMjMzNjMyNjExYzRl/content",
247242
"createdDateTime": "2023-08-11T21:29:42.6514074Z",
248243
"id": "MSMjMCMjZDMzYWQzM2EtMmVhYS0zM2FjLWJkZWItMjMzNjMyNjExYzRl"
249-
}
244+
}
250245
]
251246
}
252247
```

api-reference/beta/api/chat-sendactivitynotification.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ The following table shows the parameters that can be used with this action.
5050

5151
|Parameter|Type|Description|
5252
|:---|:---|:---|
53-
|topic|[teamworkActivityTopic](../resources/teamworkactivitytopic.md)|Topic of the notification. Specifies the resource being talked about.|
54-
|activityType|String|The activity type must be declared in the [Teams app manifest](/microsoftteams/platform/overview), except for `systemDefault` [Reserved activity type](/graph/teams-send-activityfeednotifications/#reserved-activity-types), which provides free-form text in the `Actor+Reason` line of the notification.|
55-
|chainId|Int64|Optional. Used to override a previous notification. Use the same `chainId` in subsequent requests to override the previous notification.|
56-
|previewText|[itemBody](../resources/itembody.md)|Preview text for the notification. Microsoft Teams only shows the first 150 characters.|
57-
|templateParameters|[keyValuePair](../resources/keyvaluepair.md) collection|Values for template variables defined in the activity feed entry corresponding to `activityType` in [Teams app manifest](/microsoftteams/platform/overview).|
58-
|recipient|[teamworkNotificationRecipient](../resources/teamworknotificationrecipient.md)|Recipient of the notification. For more information, see [aadUserNotificationRecipient](../resources/aadusernotificationrecipient.md) and [chatMembersNotificationRecipient](../resources/chatmembersnotificationrecipient.md). |
53+
|topic|[teamworkActivityTopic](../resources/teamworkactivitytopic.md)|The topic of the notification. Specifies the resource being talked about.|
54+
|activityType|String|The activity type must be declared in the [Teams app manifest](/microsoftteams/platform/overview), except for the `systemDefault` [Reserved activity type](/graph/teams-send-activityfeednotifications/#reserved-activity-types), which provides free-form text in the `Actor+Reason` line of the notification.|
55+
|chainId|Int64|Optional. The chain ID of the notification. Used to override a previous notification. Use the same `chainId` in subsequent requests to override the previous notification.|
56+
|previewText|[itemBody](../resources/itembody.md)|The preview text for the notification. Microsoft Teams only shows the first 150 characters.|
57+
|templateParameters|[keyValuePair](../resources/keyvaluepair.md) collection|The values for the template variables defined in the activity feed entry corresponding to `activityType` in the [Teams app manifest](/microsoftteams/platform/overview).|
58+
|recipient|[teamworkNotificationRecipient](../resources/teamworknotificationrecipient.md)|The recipient of the notification. For more information, see [aadUserNotificationRecipient](../resources/aadusernotificationrecipient.md) and [chatMembersNotificationRecipient](../resources/chatmembersnotificationrecipient.md). |
59+
| teamsAppId | String | Optional. The Teams app ID of the Teams app associated with the notification. Used to disambiguate installed apps when multiple apps with the same Microsoft Entra ID app ID are installed for the same recipient user. Avoid sharing Microsoft Entra ID app IDs between Teams apps. |
5960

6061
The following resources are supported when setting the `source` value of the **topic** property to `entityURL`:
6162

api-reference/beta/api/onlinemeeting-getalltranscripts.md

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Namespace: microsoft.graph
1313

1414
[!INCLUDE [beta-disclaimer](../../includes/beta-disclaimer.md)]
1515

16-
Get all transcripts from scheduled [onlineMeeting](../resources/onlinemeeting.md) instances for which the specified user is the organizer. This API currently does not support getting call transcripts from channel meetings.
16+
Get all transcripts from scheduled [onlineMeeting](../resources/onlinemeeting.md) instances for which the specified user is the organizer. This API currently doesn't support getting call transcripts from channel meetings.
1717

1818
You can apply the [delta](calltranscript-delta.md) function on **getAllTranscripts** to synchronize and get [callTranscript](../resources/calltranscript.md) resources as they are added for **onlineMeeting** instances organized by the specified user.
1919

@@ -48,34 +48,27 @@ GET /users/{id}/onlineMeetings/getAllTranscripts?$filter=meetingOrganizerId%20eq
4848

4949
## Response
5050

51-
If successful, this method returns a `200 OK` response code and a list of [callTranscript](../resources/calltranscript.md) objects in the response body.
51+
If successful, this method returns a `200 OK` response code and a collection of [callTranscript](../resources/calltranscript.md) objects in the response body.
5252

5353
## Example
5454

5555
### Request
5656

57-
# [HTTP](#tab/http)
57+
The following example shows a request.
58+
5859
<!-- {
5960
"blockType": "request",
6061
"sampleKeys": ["8b081ef6-4792-4def-b2c9-c363a1bf41d5"],
6162
"name": "get_alltranscipts"
6263
}-->
6364
```msgraph-interactive
64-
GET https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeeting/getAllTranscripts?$filter=meetingOrganizerId%20eq%20'8b081ef6-4792-4def-b2c9-c363a1bf41d5'
65+
GET https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/getAllTranscripts?$filter=meetingOrganizerId%20eq%20'8b081ef6-4792-4def-b2c9-c363a1bf41d5'
6566
```
6667

67-
# [Java](#tab/java)
68-
[!INCLUDE [sample-code](../includes/snippets/java/get-alltranscipts-java-snippets.md)]
69-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
70-
71-
# [JavaScript](#tab/javascript)
72-
[!INCLUDE [sample-code](../includes/snippets/javascript/get-alltranscipts-javascript-snippets.md)]
73-
[!INCLUDE [sdk-documentation](../includes/snippets/snippets-sdk-documentation-link.md)]
74-
75-
---
76-
7768
### Response
7869

70+
The following example shows the response.
71+
7972
>**Note:** The response object shown here might be shortened for readability.
8073
<!-- {
8174
"blockType": "response",
@@ -91,7 +84,7 @@ Content-type: application/json
9184
{
9285
"@odata.context":"https://graph.microsoft.com/beta/$metadata#Collection(callTranscript)",
9386
"@odata.count":10,
94-
"@odata.nextLink":"https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeeting/getAllTranscripts?$skiptoken=GGXvkS7mbjFAe9Uidm2D70e58K-BOnoJadAqkZEJmoLprr5eSP1hQPlb3dJ1AVz3xCYKxov6hSEJhsasyg",
87+
"@odata.nextLink":"https://graph.microsoft.com/beta/users/8b081ef6-4792-4def-b2c9-c363a1bf41d5/onlineMeetings/getAllTranscripts?$skiptoken=GGXvkS7mbjFAe9Uidm2D70e58K-BOnoJadAqkZEJmoLprr5eSP1hQPlb3dJ1AVz3xCYKxov6hSEJhsasyg",
9588
"value":[
9689
{
9790
"@odata.type": "#microsoft.graph.callTranscript",
@@ -107,8 +100,6 @@ Content-type: application/json
107100

108101
## See also
109102

110-
[Microsoft Graph service-specific throttling limits](/graph/throttling-limits#microsoft-teams-service-limits)
111-
112-
[Delta query overview](/graph/delta-query-overview)
113-
114-
[Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content)
103+
- [Microsoft Graph service-specific throttling limits](/graph/throttling-limits#microsoft-teams-service-limits)
104+
- [Delta query overview](/graph/delta-query-overview)
105+
- [Export content with the Microsoft Teams export APIs](/microsoftteams/export-teams-content)

api-reference/beta/api/team-sendactivitynotification.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ The following table shows the parameters that can be used with this action.
5050

5151
|Parameter|Type|Description|
5252
|:---|:---|:---|
53-
|topic|[teamworkActivityTopic](../resources/teamworkactivitytopic.md)|Topic of the notification. Specifies the resource being talked about.|
53+
|topic|[teamworkActivityTopic](../resources/teamworkactivitytopic.md)|The topic of the notification. Specifies the resource being talked about.|
5454
|activityType|String|The activity type must be declared in the [Teams app manifest](/microsoftteams/platform/overview), except for `systemDefault` [Reserved activity type](/graph/teams-send-activityfeednotifications/#reserved-activity-types), which provides free-form text in the `Actor+Reason` line of the notification.|
55-
|chainId|Int64|Optional. Used to override a previous notification. Use the same `chainId` in subsequent requests to override the previous notification.|
56-
|previewText|[itemBody](../resources/itembody.md)|Preview text for the notification. Microsoft Teams only shows the first 150 characters.|
57-
|templateParameters|[keyValuePair](../resources/keyvaluepair.md) collection|Values for template variables defined in the activity feed entry corresponding to `activityType` in [Teams app manifest](/microsoftteams/platform/overview).|
58-
|recipient|[teamworkNotificationRecipient](../resources/teamworknotificationrecipient.md)|Recipient of the notification. For more information, see [aadUserNotificationRecipient](../resources/aadusernotificationrecipient.md), [channelMembersNotificationRecipient](../resources/channelmembersnotificationrecipient.md), and [teamMembersNotificationRecipient](../resources/teammembersnotificationrecipient.md). |
55+
|chainId|Int64|Optional. The chain ID of the notification. Used to override a previous notification. Use the same `chainId` in subsequent requests to override the previous notification.|
56+
|previewText|[itemBody](../resources/itembody.md)|The preview text for the notification. Microsoft Teams only shows the first 150 characters.|
57+
|templateParameters|[keyValuePair](../resources/keyvaluepair.md) collection|The values for the template variables defined in the activity feed entry corresponding to `activityType` in the [Teams app manifest](/microsoftteams/platform/overview).|
58+
|recipient|[teamworkNotificationRecipient](../resources/teamworknotificationrecipient.md)|The recipient of the notification. For more information, see [aadUserNotificationRecipient](../resources/aadusernotificationrecipient.md), [channelMembersNotificationRecipient](../resources/channelmembersnotificationrecipient.md), and [teamMembersNotificationRecipient](../resources/teammembersnotificationrecipient.md). |
59+
| teamsAppId | String | Optional. The Teams app ID of the Teams app associated with the notification. Used to disambiguate installed apps when multiple apps with the same Microsoft Entra ID app ID are installed for the same recipient user. Avoid sharing Microsoft Entra ID app IDs between Teams apps. |
5960

6061
The following resources are supported when setting the `source` value of the **topic** property to `entityUrl`:
6162

0 commit comments

Comments
 (0)