Skip to content

Commit 2e80867

Browse files
authored
Merge branch 'main' into copilot/update-entity-attributes-nullability
2 parents 1d0fbcf + 934c0d0 commit 2e80867

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"mastodonDocsCommit": "0afc57159aecf25fd22522e948c07b4fdad332a3",
2+
"mastodonDocsCommit": "b1a35a43a22f647dc9389b0eab7be0cd06d2af9a",
33
"mastodonVersion": "4.5.0",
44
"minimumMastodonVersion": "4.2.0",
55
"blockedFiles": ["methods/notifications_alpha.md"],

dist/schema.json

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"info": {
44
"title": "Mastodon API",
55
"version": "4.5.0",
6-
"description": "Unofficial documentation for the Mastodon API. Generated with [mastodon-openapi](https://github.com/abraham/mastodon-openapi) from [0afc571](https://github.com/mastodon/documentation/commit/0afc57159aecf25fd22522e948c07b4fdad332a3). Targets [supported](https://github.com/mastodon/mastodon/security/policy#supported-versions) Mastodon versions.",
6+
"description": "Unofficial documentation for the Mastodon API. Generated with [mastodon-openapi](https://github.com/abraham/mastodon-openapi) from [b1a35a4](https://github.com/mastodon/documentation/commit/b1a35a43a22f647dc9389b0eab7be0cd06d2af9a). Targets [supported](https://github.com/mastodon/mastodon/security/policy#supported-versions) Mastodon versions.",
77
"license": {
88
"name": "GFDL-1.3",
99
"url": "https://www.gnu.org/licenses/fdl-1.3.en.html"
@@ -29768,7 +29768,7 @@
2976829768
"get": {
2976929769
"operationId": "getTimelineLink",
2977029770
"summary": "View link timeline",
29771-
"description": "View public statuses containing a link to the specified currently-trending article. This only lists statuses from people who have opted in to discoverability features.\n\nVersion history:\n\n4.3.0 - added",
29771+
"description": "View public statuses containing a link to the specified currently-trending article. This only lists statuses from people who have opted in to discoverability features.\n\nVersion history:\n\n4.3.0 - added\\\n4.5.0 - add [access control settings]",
2977229772
"tags": [
2977329773
"timelines"
2977429774
],
@@ -29809,6 +29809,11 @@
2980929809
"items": {
2981029810
"$ref": "#/components/schemas/Status"
2981129811
}
29812+
},
29813+
"examples": {
29814+
"Status200Example": {
29815+
"$ref": "#/components/examples/Status200Example"
29816+
}
2981229817
}
2981329818
}
2981429819
}
@@ -30152,7 +30157,7 @@
3015230157
"get": {
3015330158
"operationId": "getTimelinePublic",
3015430159
"summary": "View public timeline",
30155-
"description": "View public statuses.\n\nVersion history:\n\n0.0.0 - added\\\n2.3.0 - added `only_media`\\\n2.6.0 - add `min_id`\\\n3.0.0 - auth is required if public preview is disabled\\\n3.1.4 - added `remote`\\\n3.3.0 - both `min_id` and `max_id` can be used at the same time now",
30160+
"description": "View public statuses.\n\nVersion history:\n\n0.0.0 - added\\\n2.3.0 - added `only_media`\\\n2.6.0 - add `min_id`\\\n3.0.0 - auth is required if public preview is disabled\\\n3.1.4 - added `remote`\\\n3.3.0 - both `min_id` and `max_id` can be used at the same time now\\\n4.5.0 - add [access control settings]",
3015630161
"tags": [
3015730162
"timelines"
3015830163
],
@@ -30367,7 +30372,7 @@
3036730372
"get": {
3036830373
"operationId": "getTimelinesTagByHashtag",
3036930374
"summary": "View hashtag timeline",
30370-
"description": "View public statuses containing the given hashtag.\n\nVersion history:\n\n0.0.0 - added\\\n2.3.0 - added `only_media`\\\n2.6.0 - add `min_id`\\\n2.7.0 - add `any[]`, `all[]`, `none[]` for additional tags\\\n3.0.0 - auth is required if public preview is disabled\\\n3.3.0 - both `min_id` and `max_id` can be used at the same time now. add `remote`",
30375+
"description": "View public statuses containing the given hashtag.\n\nVersion history:\n\n0.0.0 - added\\\n2.3.0 - added `only_media`\\\n2.6.0 - add `min_id`\\\n2.7.0 - add `any[]`, `all[]`, `none[]` for additional tags\\\n3.0.0 - auth is required if public preview is disabled\\\n3.3.0 - both `min_id` and `max_id` can be used at the same time now. add `remote`\\\n4.5.0 - add [access control settings]",
3037130376
"tags": [
3037230377
"timelines"
3037330378
],
@@ -34222,22 +34227,22 @@
3422234227
"null"
3422334228
]
3422434229
},
34225-
"timeline_access": {
34230+
"timelines_access": {
3422634231
"description": "Access restrictions on different timelines.",
3422734232
"type": [
3422834233
"object",
3422934234
"null"
3423034235
],
3423134236
"properties": {
3423234237
"live_feeds": {
34233-
"description": "Access restrictions on [public “firehose” feeds]({{< relref \"methods/timelines#public\" >}}).",
34238+
"description": "Access restrictions on [public feeds]({{< relref \"methods/timelines#public\" >}}).",
3423434239
"type": [
3423534240
"object",
3423634241
"null"
3423734242
],
3423834243
"properties": {
3423934244
"local": {
34240-
"description": "Access restrictions for local posts in the public “firehose” feed.",
34245+
"description": "Access restrictions for local posts in the public feed.",
3424134246
"type": [
3424234247
"string",
3424334248
"null"
@@ -34249,7 +34254,7 @@
3424934254
]
3425034255
},
3425134256
"remote": {
34252-
"description": "Access restrictions for remote posts in the public “firehose” feed.",
34257+
"description": "Access restrictions for remote posts in the public feed.",
3425334258
"type": [
3425434259
"string",
3425534260
"null"

0 commit comments

Comments
 (0)