Skip to content

Commit 6f42578

Browse files
authored
Merge branch 'main' into graph-overview-updates
2 parents a79d195 + 860fd52 commit 6f42578

21 files changed

+153
-141
lines changed

api-reference/beta/api/chatmessage-post.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ If successful, this method returns a `201 Created` response code and a new [chat
7878

7979
In the following examples, the URL can use the [HTTP syntax](#http-request) described to [send a message to a chat](chat-post-messages.md), [send a message to a channel](channel-post-messages.md), or [send reply to a channel](chatmessage-post-replies.md).
8080

81+
> [!NOTE]
82+
> The Teams client has specific HTML restrictions. Therefore, the HTML elements supported by the Microsoft Graph API are compatible with the Teams client. For example, certain elements like `<div>` and inline styles may not function as intended.
83+
8184
### Example 1: Send a Hello World message in a channel
8285

8386
#### Request
@@ -764,7 +767,7 @@ Content-type: application/json
764767
{
765768
"body": {
766769
"contentType": "html",
767-
"content": "<div><div>\n<div><span><img height=\"297\" src=\"../hostedContents/1/$value\" width=\"297\" style=\"vertical-align:bottom; width:297px; height:297px\"></span>\n\n</div>\n\n\n</div>\n</div>"
770+
"content": "<img height=\"297\" src=\"../hostedContents/1/$value\" width=\"297\">"
768771
},
769772
"hostedContents":[
770773
{
@@ -855,7 +858,7 @@ Content-type: application/json
855858
},
856859
"body": {
857860
"contentType": "html",
858-
"content": "<div><div><div><span><img height=\"297\" src=\"https://graph.microsoft.com/beta/chats/19:2da4c29f6d7041eca70b638b43d45437@thread.v2/messages/1616991962672/hostedContents/aWQ9eF8wLXd1cy1kNy1kZTczYzM0YTYzZGVkYjViMDVlNjYyY2Y1NzQ5MGU5Yyx0eXBlPTEsdXJsPWh0dHBzOi8vdXMtYXBpLmFzbS5za3lwZS5jb20vdjEvb2JqZWN0cy8wLXd1cy1kNy1kZTczYzM0YTYzZGVkYjViMDVlNjYyY2Y1NzQ5MGU5Yy92aWV3cy9pbWdv/$value\" width=\"297\" style=\"vertical-align:bottom; width:297px; height:297px\"></span></div></div></div>"
861+
"content": "<img height=\"297\" src=\"https://graph.microsoft.com/v1.0/chats/19:97641583cf154265a237da28ebbde27a@thread.v2/messages/1736180156294/hostedContents/aWQ9eF8wLWV1cy1kMTQtYjUxMDlhMDhkODZkM2ZjODBkNzFlYjUzMWM4ZDlmZGEsdHlwZT0xLHVybD1odHRwczovL3VzLWFwaS5hc20uc2t5cGUuY29tL3YxL29iamVjdHMvMC1ldXMtZDE0LWI1MTA5YTA4ZDg2ZDNmYzgwZDcxZWI1MzFjOGQ5ZmRhL3ZpZXdzL2ltZ3BzaF9mdWxsc2l6ZQ==/$value\" width=\"297\">"
859862
},
860863
"attachments": [],
861864
"mentions": [],
@@ -1034,7 +1037,7 @@ Content-type: application/json
10341037
{
10351038
"body": {
10361039
"contentType": "html",
1037-
"content": "<div><div><at id=\"0\">General</at>&nbsp;Hello there!</div></div>"
1040+
"content": "<at id=\"0\">General</at>&nbsp;Hello there!"
10381041
},
10391042
"mentions": [
10401043
{
@@ -1130,7 +1133,7 @@ Content-type: application/json
11301133
},
11311134
"body": {
11321135
"contentType": "html",
1133-
"content": "<div><div><at id=\"0\">General</at>&nbsp;Hello there!</div></div>"
1136+
"content": "<at id=\"0\">General</at>&nbsp;Hello there!"
11341137
},
11351138
"channelIdentity": {
11361139
"teamId": "68a3e365-f7d9-4a56-b499-24332a9cc572",
@@ -1180,7 +1183,7 @@ Content-type: application/json
11801183
{
11811184
"body": {
11821185
"contentType": "html",
1183-
"content": "<div><div><at id=\"0\">GraphTesting</at>&nbsp;Hello team</div></div>"
1186+
"content": "<at id=\"0\">GraphTesting</at>&nbsp;Hello team"
11841187
},
11851188
"mentions": [
11861189
{
@@ -1278,7 +1281,7 @@ Content-type: application/json
12781281
},
12791282
"body": {
12801283
"contentType": "html",
1281-
"content": "<div><div><at id=\"0\">GraphTesting</at>&nbsp;Hello team</div></div>"
1284+
"content": "<at id=\"0\">GraphTesting</at>&nbsp;Hello team"
12821285
},
12831286
"channelIdentity": {
12841287
"teamId": "68a3e365-f7d9-4a56-b499-24332a9cc572",
@@ -1326,7 +1329,7 @@ Content-type: application/json
13261329
{
13271330
"body": {
13281331
"contentType": "html",
1329-
"content": "<div><div><at id=\"0\">TestTag</at>&nbsp;Testing Tags</div></div>"
1332+
"content": "<at id=\"0\">TestTag</at>&nbsp;Testing Tags"
13301333
},
13311334
"mentions": [
13321335
{
@@ -1421,7 +1424,7 @@ Content-type: application/json
14211424
},
14221425
"body": {
14231426
"contentType": "html",
1424-
"content": "<div><div><at id=\"0\">TestTag</at>&nbsp;Testing Tags</div></div>"
1427+
"content": "<at id=\"0\">TestTag</at>&nbsp;Testing Tags"
14251428
},
14261429
"channelIdentity": {
14271430
"teamId": "fbe2bf47-16c8-47cf-b4a5-4b9b187c508b",
@@ -1623,7 +1626,7 @@ Content-type: application/json
16231626
"id": "d7ddbf876ae340c3a03bada395ec7da7",
16241627
"contentType": "application/vnd.microsoft.teams.messaging-announcementBanner",
16251628
"contentUrl": null,
1626-
"content": "{\"title\":\"Announcement heading\",\"cardImageType\":\"uploadedImage\",\"cardImageDetails\":{\"uploadedImageDetail\":{\"originalImage\":{\"source\":\"../hostedContents/1/$value\",\"width\":1379,\"height\":268,\"croppedWidth\":918.0,\"croppedHeight\":178.4075416968818,\"leftMargin\":0.0,\"topMargin\":90.7962291515591,\"imageContentType\":\"image/png\"},\"croppedImage\":{\"source\":\"../hostedContents/2/$value\"}}}}",
1629+
"content": "{\"title\":\"\",\"cardImageType\":\"uploadedImage\",\"cardImageDetails\":{\"uploadedImageDetail\":{\"originalImage\":{\"source\":\"../hostedContents/2/$value\",\"imageContentType\":\"image/jpg\"},\"croppedImage\":{\"source\":\"../hostedContents/1/$value\"}}}}",
16271630
"name": null,
16281631
"thumbnailUrl": null
16291632
}
@@ -1731,7 +1734,7 @@ Content-type: application/json
17311734
"id": "d7ddbf876ae340c3a03bada395ec7da7",
17321735
"contentType": "application/vnd.microsoft.teams.messaging-announcementBanner",
17331736
"contentUrl": null,
1734-
"content": "{\"title\":\"Announcement heading\",\"cardImageType\":\"uploadedImage\",\"cardImageDetails\":{\"uploadedImageDetail\":{\"originalImage\":{\"source\":\"https://graph.microsoft.com/beta/teams/5c884e2f-83f8-4cff-af8e-0177f260b9f8/channels/19:81f49626414645c99469ee65a1a7e1a4@thread.tacv2/messages/1675104302171/hostedContents/aWQ9LHR5cGU9MSx1cmw9aHR0cHM6Ly91cy1hcGkuYXNtLnNreXBlLmNvbS92MS9vYmplY3RzLzAtd3VzLWQyLTY3OTJlM2ExMzFmNzc4YjY5NWMwYTE5ZGRkZmIwYWNiL3ZpZXdzL2ltZ28=/$value\",\"width\":1379,\"height\":268,\"croppedWidth\":918.0,\"croppedHeight\":178.4075416968818,\"leftMargin\":0.0,\"topMargin\":90.7962291515591,\"imageContentType\":\"image/png\"},\"croppedImage\":{\"source\":\"https://graph.microsoft.com/beta/teams/5c884e2f-83f8-4cff-af8e-0177f260b9f8/channels/19:81f49626414645c99469ee65a1a7e1a4@thread.tacv2/messages/1675104302171/hostedContents/aWQ9LHR5cGU9MSx1cmw9aHR0cHM6Ly91cy1hcGkuYXNtLnNreXBlLmNvbS92MS9vYmplY3RzLzAtd3VzLWQzLTAwYjhhNWZiZTA0MGRmY2MzMWZkNzM1ZDE4Yjk4NTM5L3ZpZXdzL2ltZ28=/$value\"}}}}",
1737+
"content": "{\"title\":\"Test title\",\"cardImageType\":\"uploadedImage\",\"cardImageDetails\":{\"uploadedImageDetail\":{\"originalImage\":{\"source\":\"https://graph.microsoft.com/beta/teams/5c884e2f-83f8-4cff-af8e-0177f260b9f8/channels/19%3A81f49626414645c99469ee65a1a7e1a4%40thread.tacv2/messages/1736180726031/hostedContents/aWQ9LHR5cGU9MSx1cmw9aHR0cHM6Ly91cy1hcGkuYXNtLnNreXBlLmNvbS92MS9vYmplY3RzLzAtd3VzLWQ5LTEzMzNjYzJhOWFlYTdjOWYwMWJmNjc2YWU5YWE3NTdhL3ZpZXdzL2ltZ3BzaF9mdWxsc2l6ZQ==/$value\",\"width\":1317,\"height\":366,\"croppedWidth\":1317.0,\"croppedHeight\":366.0,\"leftMargin\":0.0,\"topMargin\":0.0},\"croppedImage\":{\"source\":\"https://graph.microsoft.com/beta/teams/5c884e2f-83f8-4cff-af8e-0177f260b9f8/channels/19%3A81f49626414645c99469ee65a1a7e1a4%40thread.tacv2/messages/1736180726031/hostedContents/aWQ9LHR5cGU9MSx1cmw9aHR0cHM6Ly91cy1hcGkuYXNtLnNreXBlLmNvbS92MS9vYmplY3RzLzAtd3VzLWQ5LTEzMzNjYzJhOWFlYTdjOWYwMWJmNjc2YWU5YWE3NTdhL3ZpZXdzL2ltZ3BzaF9mdWxsc2l6ZQ==/$value\"}}}}",
17351738
"name": null,
17361739
"thumbnailUrl": null,
17371740
"teamsAppId": null

api-reference/beta/resources/attachment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ The following methods apply to any of the derived types of attachments (**fileAt
4242

4343
| Method | Return Type |Description|
4444
|:---------------|:--------|:----------|
45-
|[Get attachment](../api/attachment-get.md) | [attachment](attachment.md) |Read the properties, relationships, or raw contents of an attachment, attached to a user event, message, Outlook task, or post.|
45+
|[Get](../api/attachment-get.md) | [attachment](attachment.md) |Read the properties, relationships, or raw contents of an attachment, attached to a user event, message, Outlook task, or post.|
46+
|[Delete](../api/attachment-delete.md) | None |Delete an attachment on an event, message, Outlook task, or post. |
4647
|[Add attachment to a user event](../api/event-post-attachments.md) | [attachment](attachment.md) |Add a file, item, or link attachment to an event in a user calendar. This operation limits the size of the attachment you can add to under 3 MB.|
4748
|[Add attachment to a message](../api/message-post-attachments.md) | [attachment](attachment.md) |Add a file, item, or link attachment to a message. This operation limits the size of the attachment you can add to under 3 MB.|
4849
|[Create session to attach large file](../api/attachment-createuploadsession.md)| [uploadSession](uploadsession.md) | Create an upload session that allows an app to iteratively upload ranges of a file, so as to attach the file to the specified **message** or **event**. The file size must be between 3 MB and 150 MB.|
@@ -52,7 +53,6 @@ The following methods apply to any of the derived types of attachments (**fileAt
5253
|[List attachments of a message](../api/message-list-attachments.md) | [attachment](attachment.md) collection | Get a list of attachments for a message. |
5354
|[List attachments of an Outlook task](../api/outlooktask-list-attachments.md) (deprecated) | [attachment](attachment.md) collection | Get a list of attachments for an Outlook task. |
5455
|[List attachments of a post](../api/post-list-attachments.md) | [attachment](attachment.md) collection | Get a list of attachments for a post. |
55-
|[Delete](../api/attachment-delete.md) | None |Delete an attachment on an event, message, Outlook task, or post. |
5656

5757
## Properties
5858

api-reference/beta/resources/calendargroup.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ A group of user calendars.
2020

2121
| Method | Return Type | Description |
2222
| :---------------------------------------------------------- | :--------------------------------- | :------------------------------------------------------------ |
23-
| [List calendar groups](../api/user-list-calendargroups.md) | [Calendar](calendar.md) collection | Get the user's calendar groups. |
24-
| [Create calendar group](../api/user-post-calendargroups.md) | [Calendar](calendar.md) | Create a new calendar group. |
25-
| [Get calendar group](../api/calendargroup-get.md) | [calendarGroup](calendargroup.md) | Read properties and relationships of a calendar group object. |
26-
| [Update calendar group](../api/calendargroup-update.md) | [calendarGroup](calendargroup.md) | Update calendarGroup object. |
27-
| [Delete calendar group](../api/calendargroup-delete.md) | None | Delete calendarGroup object. |
23+
| [List](../api/user-list-calendargroups.md) | [Calendar](calendar.md) collection | Get the user's calendar groups. |
24+
| [Create](../api/user-post-calendargroups.md) | [Calendar](calendar.md) | Create a new calendar group. |
25+
| [Get](../api/calendargroup-get.md) | [calendarGroup](calendargroup.md) | Read properties and relationships of a calendar group object. |
26+
| [Update](../api/calendargroup-update.md) | [calendarGroup](calendargroup.md) | Update calendarGroup object. |
27+
| [Delete](../api/calendargroup-delete.md) | None | Delete calendarGroup object. |
2828
| [List calendars in calendar group](../api/calendargroup-list-calendars.md) | [Calendar](calendar.md) collection | List calendars in a calendar group. |
2929
| [Create calendar in calendar group](../api/calendargroup-post-calendars.md) | [Calendar](calendar.md) | Create a new Calendar in a calendar group. |
30+
| [Create calendar in calendar group](../api/calendargroup-post-calendars.md) | [Calendar](calendar.md) | Create a new Calendar in a calendar group. |
3031

3132
## Properties
3233

api-reference/beta/resources/fileattachment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Derived from [attachment](attachment.md).
3333

3434
| Method | Return Type |Description|
3535
|:---------------|:--------|:----------|
36-
|[Get attachment](../api/attachment-get.md) | [fileAttachment](fileattachment.md) |Read the properties, relationships, or raw contents of a **fileAttachment** object.|
37-
|[Delete attachment](../api/attachment-delete.md) | None |Delete a **fileAttachment** object. |
36+
|[Get](../api/attachment-get.md) | [fileAttachment](fileattachment.md) |Read the properties, relationships, or raw contents of a **fileAttachment** object.|
37+
|[Delete](../api/attachment-delete.md) | None |Delete a **fileAttachment** object. |
3838

3939
## Properties
4040
| Property | Type |Description|

api-reference/beta/resources/itemattachment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Derived from [attachment](attachment.md).
2525

2626
| Method | Return Type |Description|
2727
|:---------------|:--------|:----------|
28-
|[Get attachment](../api/attachment-get.md) | [itemAttachment](itemattachment.md) |Read the properties, relationships, or raw contents of an itemAttachment object.|
29-
|[Delete attachment](../api/attachment-delete.md) | None |Delete itemAttachment object. |
28+
|[Get](../api/attachment-get.md) | [itemAttachment](itemattachment.md) |Read the properties, relationships, or raw contents of an itemAttachment object.|
29+
|[Delete](../api/attachment-delete.md) | None |Delete itemAttachment object. |
3030

3131
## Properties
3232
| Property | Type |Description|

api-reference/beta/resources/referenceattachment.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "referenceAttachment resource type"
3-
description: "A link to a folder or file (such as a text file or Word document) on a OneDrive for Business cloud drive, or other supported storage locations, attached to "
3+
description: "A link to a folder or file (such as a text file or Word document) on a OneDrive for work or school cloud drive, or other supported storage locations, attached to "
44
ms.localizationpriority: medium
55
doc_type: resourcePageType
66
ms.subservice: "outlook"
@@ -14,7 +14,7 @@ Namespace: microsoft.graph
1414

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

17-
A link to a folder or file (such as a text file or Word document) on a OneDrive for Business cloud drive, or other supported storage locations, attached to
17+
A link to a folder or file (such as a text file or Word document) on a OneDrive for work or school cloud drive, or other supported storage locations, attached to
1818
an [event](../resources/event.md), [message](../resources/message.md), or [post](../resources/post.md) .
1919

2020
Derived from [attachment](attachment.md).
@@ -23,23 +23,23 @@ Derived from [attachment](attachment.md).
2323

2424
| Method | Return Type |Description|
2525
|:---------------|:--------|:----------|
26-
|[Get attachment](../api/attachment-get.md) | [referenceAttachment](referenceattachment.md) |Read properties and relationships of referenceAttachment object.|
27-
|[Delete attachment](../api/attachment-delete.md) | None |Delete referenceAttachment object. |
26+
|[Get](../api/attachment-get.md) | [referenceAttachment](referenceattachment.md) |Read properties and relationships of referenceAttachment object.|
27+
|[Delete](../api/attachment-delete.md) | None |Delete referenceAttachment object. |
2828

2929
## Properties
3030
| Property | Type |Description|
3131
|:---------------|:--------|:----------|
3232
|contentType|String|The content type of the attachment. Returned as `null` by default, when not set explicitly. Optional.|
33-
|id|String|The attachment ID. Read-only.|
34-
|isFolder|Boolean|Specifies whether the attachment is a link to a folder. Must set this to true if **sourceUrl** is a link to a folder. Optional.|
33+
|id|String|The attachment ID. Read-only.|
34+
|isFolder|Boolean|Specifies whether the attachment is a link to a folder. You must set this property to true if **sourceUrl** is a link to a folder. Optional.|
3535
|isInline|Boolean|Set to true if the attachment appears inline in the body of the embedding object. Optional.|
3636
|lastModifiedDateTime|DateTimeOffset|The date and time when the attachment was last modified. The Timestamp type represents date and time information using ISO 8601 format and is always in UTC time. For example, midnight UTC on Jan 1, 2014 is `2014-01-01T00:00:00Z`. Optional.|
37-
|name|String|The text that is displayed below the icon representing the embedded attachment. This does not need to be the actual file name. Required.|
37+
|name|String|The text that is displayed below the icon representing the embedded attachment. This value doesn't need to be the actual file name. Required.|
3838
|permission|referenceAttachmentPermission|Specifies the permissions granted for the attachment by the type of provider in **providerType**. Possible values are: `other`, `view`, `edit`, `anonymousView`, `anonymousEdit`, `organizationView`, `organizationEdit`. Optional.|
3939
|previewUrl|String|Applies to only a reference attachment of an image - URL to get a preview image. Use **thumbnailUrl** and **previewUrl** only when **sourceUrl** identifies an image file. Optional.|
4040
|providerType|referenceAttachmentProvider|The type of provider that supports an attachment of this contentType. Possible values are: `other`, `oneDriveBusiness`, `oneDriveConsumer`, `dropbox`. Optional.|
41-
|size|Int32|The size of the metadata in bytes that is stored on the message for the reference attachment. This value does not indicate the size of the actual file. Optional.|
42-
|sourceUrl|String|URL to get the attachment content. If this is a URL to a folder, then for the folder to be displayed correctly in Outlook or Outlook on the web, set **isFolder** to true. Required.|
41+
|size|Int32|The size of the metadata in bytes that is stored on the message for the reference attachment. This value doesn't indicate the size of the actual file. Optional.|
42+
|sourceUrl|String|URL to get the attachment content. If this value is a URL to a folder, then for the folder to be displayed correctly in Outlook or Outlook on the web, set **isFolder** to true. Required.|
4343
|thumbnailUrl|String|Applies to only a reference attachment of an image - URL to get a thumbnail image. Use **thumbnailUrl** and **previewUrl** only when **sourceUrl** identifies an image file. Optional.|
4444

4545
## Relationships

0 commit comments

Comments
 (0)