アップストリームからいろいろ持ってくる #109
Merged
アップストリームからいろいろ持ってくる #109
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| */ | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
| type FIXME = any; |
Check notice
Code scanning / devskim
A "TODO" or similar was left in source code, possibly indicating incomplete functionality Note test
| @@ -32,7 +32,8 @@ | |||
| async play({ canvasElement }) { | |||
| const canvas = within(canvasElement); | |||
| const a = canvas.getByRole<HTMLAnchorElement>('link'); | |||
| await expect(a.href).toMatch(/^https?:\/\/.*#test$/); | |||
| // FIXME: 通るけどその後落ちるのでコメントアウト | |||
Check notice
Code scanning / devskim
A "TODO" or similar was left in source code, possibly indicating incomplete functionality Note
| @@ -200,6 +224,79 @@ | |||
|
|
|||
| assert.strictEqual(fired, false); | |||
| }); | |||
|
|
|||
| /** | |||
| * TODO: 落ちる | |||
Check notice
Code scanning / devskim
A "TODO" or similar was left in source code, possibly indicating incomplete functionality Note test
| // @ts-expect-error UserDetailedNotMe doesn't include isModerator | ||
| { label: '自分以外から見たときはModeratorか判定できない', user: () => userModerator, selector: (user: misskey.entities.UserDetailedNotMe) => user.isModerator, expected: () => undefined }, | ||
| { label: 'サイレンスになっている', user: () => userSilenced, selector: (user: misskey.entities.UserDetailed) => user.isSilenced }, | ||
| // FIXME: 落ちる |
Check notice
Code scanning / devskim
A "TODO" or similar was left in source code, possibly indicating incomplete functionality Note test
| } | ||
| })); | ||
| } | ||
| // TODO: ↓まとめてクエリしたい |
Check notice
Code scanning / devskim
A "TODO" or similar was left in source code, possibly indicating incomplete functionality Note
| return mutex !== '1'; | ||
| // public for test | ||
| public async tryLock(host: string): Promise<string | null> { | ||
| // TODO: マイグレーションなのであとで消す (2024.3.1) |
Check notice
Code scanning / devskim
A "TODO" or similar was left in source code, possibly indicating incomplete functionality Note
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #109 +/- ##
===========================================
+ Coverage 57.49% 65.92% +8.42%
===========================================
Files 851 1052 +201
Lines 93864 128166 +34302
Branches 5268 5602 +334
===========================================
+ Hits 53967 84490 +30523
- Misses 38086 42109 +4023
+ Partials 1811 1567 -244 ☔ View full report in Codecov by Sentry. |
|
이 PR에 의한 api.json 차이 차이점은 여기에서 볼 수 있음--- base
+++ head
@@ -6119,8 +6119,16 @@
}
},
"responses": {
- "204": {
- "description": "OK (without any results)"
+ "200": {
+ "description": "OK (with results)",
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "$ref": "#/components/schemas/EmojiDetailed"
+ }
+ }
+ }
},
"400": {
"description": "Client error",
@@ -6320,8 +6328,16 @@
}
},
"responses": {
- "204": {
- "description": "OK (without any results)"
+ "200": {
+ "description": "OK (with results)",
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "$ref": "#/components/schemas/EmojiDetailed"
+ }
+ }
+ }
},
"400": {
"description": "Client error",
@@ -8408,10 +8424,17 @@
}
}
},
- "required": [
- "id",
- "name",
- "aliases"
+ "anyOf": [
+ {
+ "required": [
+ "id"
+ ]
+ },
+ {
+ "required": [
+ "name"
+ ]
+ }
]
}
}
@@ -9026,11 +9049,13 @@
},
"isSuspended": {
"type": "boolean"
+ },
+ "moderationNote": {
+ "type": "string"
}
},
"required": [
- "host",
- "isSuspended"
+ "host"
]
}
}
@@ -12537,6 +12562,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12579,6 +12605,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12621,6 +12648,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12663,6 +12691,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12705,6 +12734,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12747,6 +12777,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12789,6 +12820,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12831,6 +12863,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12873,6 +12906,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12915,6 +12949,50 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
+ "never"
+ ]
+ }
+ },
+ "required": [
+ "type"
+ ]
+ },
+ {
+ "type": "object",
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": [
+ "list"
+ ]
+ },
+ "userListId": {
+ "type": "string",
+ "format": "misskey:id"
+ }
+ },
+ "required": [
+ "type",
+ "userListId"
+ ]
+ }
+ ]
+ },
+ "groupInvited": {
+ "type": "object",
+ "oneOf": [
+ {
+ "type": "object",
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": [
+ "all",
+ "following",
+ "follower",
+ "mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12957,6 +13035,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -12999,6 +13078,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -13041,6 +13121,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -13083,6 +13164,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -17744,16 +17826,7 @@
}
},
"required": [
- "antennaId",
- "name",
- "src",
- "keywords",
- "excludeKeywords",
- "users",
- "caseSensitive",
- "withReplies",
- "withFile",
- "notify"
+ "antennaId"
]
}
}
@@ -38469,7 +38542,7 @@
"type": "array",
"uniqueItems": true,
"minItems": 1,
- "maxItems": 128,
+ "maxItems": 32,
"items": {
"type": "string",
"format": "misskey:id"
@@ -45461,8 +45534,8 @@
"pollEnded",
"receiveFollowRequest",
"followRequestAccepted",
- "roleAssigned",
"groupInvited",
+ "roleAssigned",
"achievementEarned",
"app",
"test",
@@ -45485,8 +45558,8 @@
"pollEnded",
"receiveFollowRequest",
"followRequestAccepted",
- "roleAssigned",
"groupInvited",
+ "roleAssigned",
"achievementEarned",
"app",
"test",
@@ -45700,11 +45773,13 @@
"pollEnded",
"receiveFollowRequest",
"followRequestAccepted",
- "roleAssigned",
"groupInvited",
+ "roleAssigned",
"achievementEarned",
"app",
"test",
+ "reaction:grouped",
+ "renote:grouped",
"pollVote"
]
}
@@ -45724,11 +45799,13 @@
"pollEnded",
"receiveFollowRequest",
"followRequestAccepted",
- "roleAssigned",
"groupInvited",
+ "roleAssigned",
"achievementEarned",
"app",
"test",
+ "reaction:grouped",
+ "renote:grouped",
"pollVote"
]
}
@@ -49293,7 +49370,7 @@
},
"avatarDecorations": {
"type": "array",
- "maxItems": 128,
+ "maxItems": 16,
"items": {
"type": "object",
"properties": {
@@ -49499,6 +49576,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49541,6 +49619,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49583,6 +49662,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49625,6 +49705,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49667,6 +49748,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49709,6 +49791,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49751,6 +49834,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49793,6 +49877,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49835,6 +49920,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49877,6 +49963,50 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
+ "never"
+ ]
+ }
+ },
+ "required": [
+ "type"
+ ]
+ },
+ {
+ "type": "object",
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": [
+ "list"
+ ]
+ },
+ "userListId": {
+ "type": "string",
+ "format": "misskey:id"
+ }
+ },
+ "required": [
+ "type",
+ "userListId"
+ ]
+ }
+ ]
+ },
+ "groupInvited": {
+ "type": "object",
+ "oneOf": [
+ {
+ "type": "object",
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": [
+ "all",
+ "following",
+ "follower",
+ "mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49919,6 +50049,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -49961,6 +50092,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -50003,6 +50135,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -50045,6 +50178,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -53415,380 +53549,15 @@
"application/json": {
"schema": {
"type": "object",
- "properties": {
- "maintainerName": {
- "type": [
- "string",
- "null"
- ]
- },
- "maintainerEmail": {
- "type": [
- "string",
- "null"
- ]
- },
- "version": {
- "type": "string"
- },
- "basedMisskeyVersion": {
- "type": "string"
- },
- "providesTarball": {
- "type": "boolean"
- },
- "name": {
- "type": "string"
- },
- "shortName": {
- "type": [
- "string",
- "null"
- ]
- },
- "uri": {
- "type": "string",
- "format": "url",
- "example": "https://cherrypick.example.com"
- },
- "description": {
- "type": [
- "string",
- "null"
- ]
- },
- "langs": {
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "tosUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "repositoryUrl": {
- "type": [
- "string",
- "null"
- ],
- "default": "https://github.com/kokonect-link/cherrypick"
- },
- "feedbackUrl": {
- "type": [
- "string",
- "null"
- ],
- "default": "https://github.com/kokonect-link/cherrypick/issues/new"
- },
- "defaultDarkTheme": {
- "type": [
- "string",
- "null"
- ]
- },
- "defaultLightTheme": {
- "type": [
- "string",
- "null"
- ]
- },
- "disableRegistration": {
- "type": "boolean"
- },
- "cacheRemoteFiles": {
- "type": "boolean"
- },
- "cacheRemoteSensitiveFiles": {
- "type": "boolean"
- },
- "emailRequiredForSignup": {
- "type": "boolean"
- },
- "enableHcaptcha": {
- "type": "boolean"
- },
- "hcaptchaSiteKey": {
- "type": [
- "string",
- "null"
- ]
- },
- "enableMcaptcha": {
- "type": "boolean"
- },
- "mcaptchaSiteKey": {
- "type": [
- "string",
- "null"
- ]
- },
- "mcaptchaInstanceUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "enableRecaptcha": {
- "type": "boolean"
- },
- "recaptchaSiteKey": {
- "type": [
- "string",
- "null"
- ]
- },
- "enableTurnstile": {
- "type": "boolean"
- },
- "turnstileSiteKey": {
- "type": [
- "string",
- "null"
- ]
- },
- "swPublickey": {
- "type": [
- "string",
- "null"
- ]
- },
- "mascotImageUrl": {
- "type": "string",
- "default": "/assets/ai.png"
- },
- "bannerUrl": {
- "type": "string"
- },
- "serverErrorImageUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "infoImageUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "notFoundImageUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "iconUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "maxNoteTextLength": {
- "type": "number"
- },
- "ads": {
- "type": "array",
- "items": {
- "type": "object",
- "properties": {
- "id": {
- "type": "string",
- "format": "id",
- "example": "xxxxxxxxxx"
- },
- "url": {
- "type": "string",
- "format": "url"
- },
- "place": {
- "type": "string"
- },
- "ratio": {
- "type": "number"
- },
- "imageUrl": {
- "type": "string",
- "format": "url"
- },
- "dayOfWeek": {
- "type": "integer"
- }
- },
- "required": [
- "id",
- "url",
- "place",
- "ratio",
- "imageUrl",
- "dayOfWeek"
- ]
- }
- },
- "notesPerOneAd": {
- "type": "number",
- "default": 0
- },
- "requireSetup": {
- "type": "boolean",
- "example": false
- },
- "enableEmail": {
- "type": "boolean"
- },
- "enableServiceWorker": {
- "type": "boolean"
- },
- "translatorAvailable": {
- "type": "boolean"
- },
- "proxyAccountName": {
- "type": [
- "string",
- "null"
- ]
- },
- "mediaProxy": {
- "type": "string"
- },
- "urlPreviewEndpoint": {
- "type": "string"
- },
- "features": {
+ "oneOf": [
+ {
"type": "object",
- "properties": {
- "registration": {
- "type": "boolean"
- },
- "localTimeline": {
- "type": "boolean"
- },
- "globalTimeline": {
- "type": "boolean"
- },
- "hcaptcha": {
- "type": "boolean"
- },
- "recaptcha": {
- "type": "boolean"
- },
- "objectStorage": {
- "type": "boolean"
- },
- "serviceWorker": {
- "type": "boolean"
- },
- "miauth": {
- "type": "boolean",
- "default": true
- }
- },
- "required": [
- "registration",
- "localTimeline",
- "globalTimeline",
- "hcaptcha",
- "recaptcha",
- "objectStorage",
- "serviceWorker"
- ]
- },
- "backgroundImageUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "impressumUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "logoImageUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "privacyPolicyUrl": {
- "type": [
- "string",
- "null"
- ]
- },
- "serverRules": {
- "type": "array",
- "items": {
- "type": "string"
- }
- },
- "themeColor": {
- "type": [
- "string",
- "null"
- ]
+ "$ref": "#/components/schemas/MetaLite"
},
- "policies": {
+ {
"type": "object",
- "$ref": "#/components/schemas/RolePolicies"
+ "$ref": "#/components/schemas/MetaDetailed"
}
- },
- "required": [
- "maintainerName",
- "maintainerEmail",
- "version",
- "basedMisskeyVersion",
- "providesTarball",
- "name",
- "shortName",
- "uri",
- "description",
- "langs",
- "tosUrl",
- "repositoryUrl",
- "feedbackUrl",
- "defaultDarkTheme",
- "defaultLightTheme",
- "disableRegistration",
- "cacheRemoteFiles",
- "cacheRemoteSensitiveFiles",
- "emailRequiredForSignup",
- "enableHcaptcha",
- "hcaptchaSiteKey",
- "enableMcaptcha",
- "mcaptchaSiteKey",
- "mcaptchaInstanceUrl",
- "enableRecaptcha",
- "recaptchaSiteKey",
- "enableTurnstile",
- "turnstileSiteKey",
- "swPublickey",
- "mascotImageUrl",
- "bannerUrl",
- "serverErrorImageUrl",
- "infoImageUrl",
- "notFoundImageUrl",
- "iconUrl",
- "maxNoteTextLength",
- "ads",
- "notesPerOneAd",
- "requireSetup",
- "enableEmail",
- "enableServiceWorker",
- "translatorAvailable",
- "proxyAccountName",
- "mediaProxy",
- "urlPreviewEndpoint",
- "backgroundImageUrl",
- "impressumUrl",
- "logoImageUrl",
- "privacyPolicyUrl",
- "serverRules",
- "themeColor",
- "policies"
]
}
}
@@ -56914,6 +56683,15 @@
}
}
},
+ "CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY": {
+ "value": {
+ "error": {
+ "message": "You cannot reply to a specified visibility note with extended visibility.",
+ "code": "CANNOT_REPLY_TO_SPECIFIED_VISIBILITY_NOTE_WITH_EXTENDED_VISIBILITY",
+ "id": "ed940410-535c-4d5e-bfa3-af798671e93c"
+ }
+ }
+ },
"CANNOT_CREATE_ALREADY_EXPIRED_POLL": {
"value": {
"error": {
@@ -56968,6 +56746,15 @@
}
}
},
+ "CONTAINS_TOO_MANY_MENTIONS": {
+ "value": {
+ "error": {
+ "message": "Cannot post because it exceeds the allowed number of mentions.",
+ "code": "CONTAINS_TOO_MANY_MENTIONS",
+ "id": "4de0363a-3046-481b-9b0f-feff3e211025"
+ }
+ }
+ },
"INVALID_PARAM": {
"value": {
"error": {
@@ -63017,6 +62804,135 @@
}
}
},
+ "/notifications/flush": {
+ "post": {
+ "operationId": "notifications___flush",
+ "summary": "notifications/flush",
+ "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *write:notifications*",
+ "externalDocs": {
+ "description": "Source code",
+ "url": "https://github.com/kokonect-link/cherrypick/blob/develop/packages/backend/src/server/api/endpoints/notifications/flush.ts"
+ },
+ "tags": [
+ "notifications"
+ ],
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ],
+ "responses": {
+ "204": {
+ "description": "OK (without any results)"
+ },
+ "400": {
+ "description": "Client error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "INVALID_PARAM": {
+ "value": {
+ "error": {
+ "message": "Invalid param.",
+ "code": "INVALID_PARAM",
+ "id": "3d81ceae-475f-4600-b2a8-2bc116157532"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "401": {
+ "description": "Authentication error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "CREDENTIAL_REQUIRED": {
+ "value": {
+ "error": {
+ "message": "Credential required.",
+ "code": "CREDENTIAL_REQUIRED",
+ "id": "1384574d-a912-4b81-8601-c7b1c4085df1"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "403": {
+ "description": "Forbidden error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "AUTHENTICATION_FAILED": {
+ "value": {
+ "error": {
+ "message": "Authentication failed. Please ensure your token is correct.",
+ "code": "AUTHENTICATION_FAILED",
+ "id": "b0a7f5f8-dc2f-4171-b91f-de88ad238e14"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "418": {
+ "description": "I'm Ai",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "I_AM_AI": {
+ "value": {
+ "error": {
+ "message": "You sent a request to Ai-chan, CherryPick's showgirl, instead of the server.",
+ "code": "I_AM_AI",
+ "id": "60c46cd1-f23a-46b1-bebe-5d2b73951a84"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "500": {
+ "description": "Internal server error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "INTERNAL_ERROR": {
+ "value": {
+ "error": {
+ "message": "Internal error occurred. Please contact us if the error persists.",
+ "code": "INTERNAL_ERROR",
+ "id": "5d37dbcb-891e-41ca-a3d6-e690c97775ac"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/notifications/mark-all-as-read": {
"post": {
"operationId": "notifications___mark-all-as-read",
@@ -64819,6 +64735,14 @@
"items": {
"type": "string"
}
+ },
+ "visibility": {
+ "type": "string",
+ "enum": [
+ "public",
+ "private"
+ ],
+ "default": "public"
}
},
"required": [
@@ -66012,11 +65936,7 @@
}
},
"required": [
- "flashId",
- "title",
- "summary",
- "script",
- "permissions"
+ "flashId"
]
}
}
@@ -80600,7 +80520,10 @@
]
},
"emojis": {
- "type": "object"
+ "type": "object",
+ "additionalProperties": {
+ "type": "string"
+ }
},
"onlineStatus": {
"type": "string",
@@ -81082,6 +81005,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81124,6 +81048,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81166,6 +81091,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81208,6 +81134,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81250,6 +81177,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81292,6 +81220,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81334,6 +81263,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81376,6 +81306,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81418,6 +81349,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81460,6 +81392,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81502,6 +81435,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81544,6 +81478,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81586,6 +81521,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81628,6 +81564,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -81670,6 +81607,7 @@
"following",
"follower",
"mutualFollow",
+ "followingOrFollower",
"never"
]
}
@@ -82473,6 +82411,9 @@
]
}
},
+ "reactionCount": {
+ "type": "number"
+ },
"renoteCount": {
"type": "number"
},
@@ -82511,6 +82452,7 @@
"reactionAcceptance",
"reactionEmojis",
"reactions",
+ "reactionCount",
"renoteCount",
"repliesCount"
]
@@ -83154,6 +83096,35 @@
"createdAt",
"type"
]
+ },
+ {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string",
+ "format": "id"
+ },
+ "createdAt": {
+ "type": "string",
+ "format": "date-time"
+ },
+ "type": {
+ "type": "string",
+ "enum": [
+ "groupInvited"
+ ]
+ },
+ "invitation": {
+ "type": "string",
+ "format": "id"
+ }
+ },
+ "required": [
+ "id",
+ "createdAt",
+ "type",
+ "invitation"
+ ]
}
]
},
@@ -84215,6 +84186,12 @@
"null"
],
"format": "date-time"
+ },
+ "moderationNote": {
+ "type": [
+ "string",
+ "null"
+ ]
}
},
"required": [
@@ -84578,6 +84555,30 @@
"type"
]
},
+ "RoleCondFormulaValueAssignedRole": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string"
+ },
+ "type": {
+ "type": "string",
+ "enum": [
+ "roleAssignedTo"
+ ]
+ },
+ "roleId": {
+ "type": "string",
+ "format": "id",
+ "example": "xxxxxxxxxx"
+ }
+ },
+ "required": [
+ "id",
+ "type",
+ "roleId"
+ ]
+ },
"RoleCondFormulaValueCreated": {
"type": "object",
"properties": {
@@ -84641,6 +84642,9 @@
"$ref": "#/components/schemas/RoleCondFormulaValueIsLocalOrRemote"
},
{
+ "$ref": "#/components/schemas/RoleCondFormulaValueAssignedRole"
+ },
+ {
"$ref": "#/components/schemas/RoleCondFormulaValueCreated"
},
{
@@ -84804,6 +84808,9 @@
"canPublicNote": {
"type": "boolean"
},
+ "mentionLimit": {
+ "type": "integer"
+ },
"canInvite": {
"type": "boolean"
},
@@ -84881,6 +84888,7 @@
"gtlAvailable",
"ltlAvailable",
"canPublicNote",
+ "mentionLimit",
"canInvite",
"inviteLimit",
"inviteLimitCycle",
@@ -85201,6 +85209,422 @@
"logs",
"map"
]
+ },
+ "MetaLite": {
+ "type": "object",
+ "properties": {
+ "maintainerName": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "maintainerEmail": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "version": {
+ "type": "string"
+ },
+ "basedMisskeyVersion": {
+ "type": "string"
+ },
+ "providesTarball": {
+ "type": "boolean"
+ },
+ "name": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "shortName": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "uri": {
+ "type": "string",
+ "format": "url",
+ "example": "https://cherrypick.example.com"
+ },
+ "description": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "langs": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "tosUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "repositoryUrl": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "default": "https://github.com/kokonect-link/cherrypick"
+ },
+ "feedbackUrl": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "default": "https://github.com/kokonect-link/cherrypick/issues/new"
+ },
+ "defaultDarkTheme": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "defaultLightTheme": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "disableRegistration": {
+ "type": "boolean"
+ },
+ "emailRequiredForSignup": {
+ "type": "boolean"
+ },
+ "enableHcaptcha": {
+ "type": "boolean"
+ },
+ "hcaptchaSiteKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "enableMcaptcha": {
+ "type": "boolean"
+ },
+ "mcaptchaSiteKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "mcaptchaInstanceUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "enableRecaptcha": {
+ "type": "boolean"
+ },
+ "recaptchaSiteKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "enableTurnstile": {
+ "type": "boolean"
+ },
+ "turnstileSiteKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "swPublickey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "mascotImageUrl": {
+ "type": "string",
+ "default": "/assets/ai.png"
+ },
+ "bannerUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "serverErrorImageUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "infoImageUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "notFoundImageUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "iconUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "maxNoteTextLength": {
+ "type": "number"
+ },
+ "ads": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string",
+ "format": "id",
+ "example": "xxxxxxxxxx"
+ },
+ "url": {
+ "type": "string",
+ "format": "url"
+ },
+ "place": {
+ "type": "string"
+ },
+ "ratio": {
+ "type": "number"
+ },
+ "imageUrl": {
+ "type": "string",
+ "format": "url"
+ },
+ "dayOfWeek": {
+ "type": "integer"
+ }
+ },
+ "required": [
+ "id",
+ "url",
+ "place",
+ "ratio",
+ "imageUrl",
+ "dayOfWeek"
+ ]
+ }
+ },
+ "notesPerOneAd": {
+ "type": "number",
+ "default": 0
+ },
+ "enableEmail": {
+ "type": "boolean"
+ },
+ "enableServiceWorker": {
+ "type": "boolean"
+ },
+ "translatorAvailable": {
+ "type": "boolean"
+ },
+ "mediaProxy": {
+ "type": "string"
+ },
+ "enableUrlPreview": {
+ "type": "boolean"
+ },
+ "urlPreviewEndpoint": {
+ "type": "string"
+ },
+ "backgroundImageUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "impressumUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "logoImageUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "privacyPolicyUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "serverRules": {
+ "type": "array",
+ "items": {
+ "type": "string"
+ }
+ },
+ "themeColor": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "policies": {
+ "type": "object",
+ "$ref": "#/components/schemas/RolePolicies"
+ }
+ },
+ "required": [
+ "maintainerName",
+ "maintainerEmail",
+ "version",
+ "basedMisskeyVersion",
+ "providesTarball",
+ "name",
+ "shortName",
+ "uri",
+ "description",
+ "langs",
+ "tosUrl",
+ "repositoryUrl",
+ "feedbackUrl",
+ "defaultDarkTheme",
+ "defaultLightTheme",
+ "disableRegistration",
+ "emailRequiredForSignup",
+ "enableHcaptcha",
+ "hcaptchaSiteKey",
+ "enableMcaptcha",
+ "mcaptchaSiteKey",
+ "mcaptchaInstanceUrl",
+ "enableRecaptcha",
+ "recaptchaSiteKey",
+ "enableTurnstile",
+ "turnstileSiteKey",
+ "swPublickey",
+ "mascotImageUrl",
+ "bannerUrl",
+ "serverErrorImageUrl",
+ "infoImageUrl",
+ "notFoundImageUrl",
+ "iconUrl",
+ "maxNoteTextLength",
+ "ads",
+ "notesPerOneAd",
+ "enableEmail",
+ "enableServiceWorker",
+ "translatorAvailable",
+ "mediaProxy",
+ "enableUrlPreview",
+ "urlPreviewEndpoint",
+ "backgroundImageUrl",
+ "impressumUrl",
+ "logoImageUrl",
+ "privacyPolicyUrl",
+ "serverRules",
+ "themeColor",
+ "policies"
+ ]
+ },
+ "MetaDetailedOnly": {
+ "type": "object",
+ "properties": {
+ "features": {
+ "type": "object",
+ "properties": {
+ "registration": {
+ "type": "boolean"
+ },
+ "emailRequiredForSignup": {
+ "type": "boolean"
+ },
+ "localTimeline": {
+ "type": "boolean"
+ },
+ "globalTimeline": {
+ "type": "boolean"
+ },
+ "hcaptcha": {
+ "type": "boolean"
+ },
+ "turnstile": {
+ "type": "boolean"
+ },
+ "recaptcha": {
+ "type": "boolean"
+ },
+ "objectStorage": {
+ "type": "boolean"
+ },
+ "serviceWorker": {
+ "type": "boolean"
+ },
+ "miauth": {
+ "type": "boolean",
+ "default": true
+ }
+ },
+ "required": [
+ "registration",
+ "emailRequiredForSignup",
+ "localTimeline",
+ "globalTimeline",
+ "hcaptcha",
+ "turnstile",
+ "recaptcha",
+ "objectStorage",
+ "serviceWorker"
+ ]
+ },
+ "proxyAccountName": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "requireSetup": {
+ "type": "boolean",
+ "example": false
+ },
+ "cacheRemoteFiles": {
+ "type": "boolean"
+ },
+ "cacheRemoteSensitiveFiles": {
+ "type": "boolean"
+ }
+ },
+ "required": [
+ "proxyAccountName",
+ "requireSetup",
+ "cacheRemoteFiles",
+ "cacheRemoteSensitiveFiles"
+ ]
+ },
+ "MetaDetailed": {
+ "type": "object",
+ "allOf": [
+ {
+ "type": "object",
+ "$ref": "#/components/schemas/MetaLite"
+ },
+ {
+ "type": "object",
+ "$ref": "#/components/schemas/MetaDetailedOnly"
+ }
+ ]
}
},
"securitySchemes": { |
penginn-net
requested changes
Jun 22, 2024
penginn-net
reviewed
Jun 22, 2024
penginn-net
approved these changes
Jun 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist