Merge upstream 21 #203
Merged
Merge upstream 21 #203
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
* don't double-url-encode rss urls `url.searchParams.set()` already encodes the values passed! (this is a partial revert of 0472d43, the change in `statusbar-rss.vue` was correct) * Update Changelog --------- Co-authored-by: dakkar <[email protected]>
…v#15268) * feature(backend): config(default.yml)からSQLログ全文を出力するか否かを設定可能に * disableHighlightやめる * refactor
* Fix(frontend): 削除して編集で引用ありを消せない * docs(changelog): update CHANGELOG.md * rename noteToRenote -> renoteTargetNote with type fix * Update Changelog --------- Co-authored-by: Sayamame-beans <[email protected]> Co-authored-by: syuilo <[email protected]>
* wip * misskey-dev#15039 (comment) の反映 Co-authored-by: Kagami Sascha Rosylight <[email protected]> * fix CHANGELOG.md * remove inspection --------- Co-authored-by: Kagami Sascha Rosylight <[email protected]>
…#15151) * feat(frontend): CAPTCHAの設定変更時は実際に検証を通過しないと保存できないようにする * なしでも保存できるようにした * fix CHANGELOG.md * フォームが増殖するのを修正 * add comment * add server-side verify * fix ci * fix * fix * fix i18n * add current.ts * fix text * fix * regenerate locales * fix MkFormFooter.vue --------- Co-authored-by: syuilo <[email protected]>
* enhance(backend): metaにfederation modeに関する情報を公開 * enhance(frontend): 登録画面の注意書きを追加 * enhance(frontend): aboutページ・サーバー情報 * enhance(frontend): サーバー統計 * enhance(frontend): みつけるページ * enhance(frontend): 検索 * enhance(frontend): ユーザー選択 * enhance(frontend): 設定画面 * enhance(frontend): ウィジェット * enhance(frontend): リモートで開くオプション * Update Changelog * enhance(frontend): ステータスバー * i18n --------- Co-authored-by: syuilo <[email protected]>
* UserWebhook側の対処 * SystemWebhook側の対処 * fix test
…y-dev#15104) * fix(backend): pagesのnameの重複チェックはnameプロパティがある時のみ行うように * Update Changelog --------- Co-authored-by: syuilo <[email protected]>
|
このPRによるapi.jsonの差分 差分はこちら--- base
+++ head
@@ -1,7 +1,7 @@
{
"openapi": "3.1.0",
"info": {
- "version": "2024.11.1-alpha.0",
+ "version": "2025.1.0-alpha.0",
"title": "Misskey API"
},
"externalDocs": {
@@ -4752,6 +4752,492 @@
}
}
},
+ "/admin/captcha/current": {
+ "post": {
+ "operationId": "admin___captcha___current",
+ "summary": "admin/captcha/current",
+ "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *read:admin:meta*",
+ "externalDocs": {
+ "description": "Source code",
+ "url": "https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/admin/captcha/current.ts"
+ },
+ "tags": [
+ "admin"
+ ],
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "OK (with results)",
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "provider": {
+ "type": "string",
+ "enum": [
+ "none",
+ "hcaptcha",
+ "mcaptcha",
+ "recaptcha",
+ "turnstile",
+ "testcaptcha"
+ ]
+ },
+ "hcaptcha": {
+ "type": "object",
+ "properties": {
+ "siteKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "secretKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "required": [
+ "siteKey",
+ "secretKey"
+ ]
+ },
+ "mcaptcha": {
+ "type": "object",
+ "properties": {
+ "siteKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "secretKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "instanceUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "required": [
+ "siteKey",
+ "secretKey",
+ "instanceUrl"
+ ]
+ },
+ "recaptcha": {
+ "type": "object",
+ "properties": {
+ "siteKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "secretKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "required": [
+ "siteKey",
+ "secretKey"
+ ]
+ },
+ "turnstile": {
+ "type": "object",
+ "properties": {
+ "siteKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "secretKey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "required": [
+ "siteKey",
+ "secretKey"
+ ]
+ }
+ },
+ "required": [
+ "provider",
+ "hcaptcha",
+ "mcaptcha",
+ "recaptcha",
+ "turnstile"
+ ]
+ }
+ }
+ }
+ },
+ "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, Misskey'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"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "/admin/captcha/save": {
+ "post": {
+ "operationId": "admin___captcha___save",
+ "summary": "admin/captcha/save",
+ "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *write:admin:meta*",
+ "externalDocs": {
+ "description": "Source code",
+ "url": "https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/admin/captcha/save.ts"
+ },
+ "tags": [
+ "admin"
+ ],
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ],
+ "requestBody": {
+ "required": true,
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "provider": {
+ "type": "string",
+ "enum": [
+ "none",
+ "hcaptcha",
+ "mcaptcha",
+ "recaptcha",
+ "turnstile",
+ "testcaptcha"
+ ]
+ },
+ "captchaResult": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "sitekey": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "secret": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "instanceUrl": {
+ "type": [
+ "string",
+ "null"
+ ]
+ }
+ },
+ "required": [
+ "provider"
+ ]
+ }
+ }
+ }
+ },
+ "responses": {
+ "204": {
+ "description": "OK (without any results)"
+ },
+ "400": {
+ "description": "Client error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "INVALID_PROVIDER": {
+ "value": {
+ "error": {
+ "message": "Invalid provider.",
+ "code": "INVALID_PROVIDER",
+ "id": "14bf7ae1-80cc-4363-acb2-4fd61d086af0",
+ "httpStatusCode": 400
+ }
+ }
+ },
+ "INVALID_PARAMETERS": {
+ "value": {
+ "error": {
+ "message": "Invalid parameters.",
+ "code": "INVALID_PARAMETERS",
+ "id": "26654194-410e-44e2-b42e-460ff6f92476",
+ "httpStatusCode": 400
+ }
+ }
+ },
+ "NO_RESPONSE_PROVIDED": {
+ "value": {
+ "error": {
+ "message": "No response provided.",
+ "code": "NO_RESPONSE_PROVIDED",
+ "id": "40acbba8-0937-41fb-bb3f-474514d40afe",
+ "httpStatusCode": 400
+ }
+ }
+ },
+ "REQUEST_FAILED": {
+ "value": {
+ "error": {
+ "message": "Request failed.",
+ "code": "REQUEST_FAILED",
+ "id": "0f4fe2f1-2c15-4d6e-b714-efbfcde231cd",
+ "httpStatusCode": 500
+ }
+ }
+ },
+ "VERIFICATION_FAILED": {
+ "value": {
+ "error": {
+ "message": "Verification failed.",
+ "code": "VERIFICATION_FAILED",
+ "id": "c41c067f-24f3-4150-84b2-b5a3ae8c2214",
+ "httpStatusCode": 400
+ }
+ }
+ },
+ "UNKNOWN": {
+ "value": {
+ "error": {
+ "message": "unknown",
+ "code": "UNKNOWN",
+ "id": "f868d509-e257-42a9-99c1-42614b031a97",
+ "httpStatusCode": 500
+ }
+ }
+ },
+ "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, Misskey'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"
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
"/admin/delete-all-files-of-a-user": {
"post": {
"operationId": "admin___delete-all-files-of-a-user",
@@ -82998,6 +83484,14 @@
},
"maxFileSize": {
"type": "number"
+ },
+ "federation": {
+ "type": "string",
+ "enum": [
+ "all",
+ "specified",
+ "none"
+ ]
}
},
"required": [
@@ -83052,7 +83546,8 @@
"themeColor",
"policies",
"noteSearchableScope",
- "maxFileSize"
+ "maxFileSize",
+ "federation"
]
},
"MetaDetailedOnly": { |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
kanarikanaru
approved these changes
Jan 17, 2025
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.
What
Why
Additional info (optional)
Checklist