開発中の新カスタム絵文字管理画面(β)の取り込み #239
Merged
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
# Conflicts: # packages/misskey-js/src/api.types.ts # packages/misskey-js/src/autogen/apiClientJSDoc.ts # packages/misskey-js/src/autogen/endpoint.ts # packages/misskey-js/src/autogen/entities.ts # packages/misskey-js/src/autogen/models.ts # packages/misskey-js/src/autogen/types.ts
# Conflicts: # packages/frontend/package.json # packages/misskey-js/src/autogen/apiClientJSDoc.ts # packages/misskey-js/src/autogen/endpoint.ts # packages/misskey-js/src/autogen/entities.ts # packages/misskey-js/src/autogen/models.ts # packages/misskey-js/src/autogen/types.ts # pnpm-lock.yaml
# Conflicts: # packages/misskey-js/src/autogen/apiClientJSDoc.ts # packages/misskey-js/src/autogen/endpoint.ts # packages/misskey-js/src/autogen/entities.ts # packages/misskey-js/src/autogen/models.ts # packages/misskey-js/src/autogen/types.ts
# Conflicts: # packages/frontend/src/components/MkFolder.vue
# Conflicts: # packages/backend/src/core/CustomEmojiService.ts # packages/backend/src/server/api/endpoints/admin/emoji/update.ts # packages/frontend/src/components/global/MkStickyContainer.vue
|
このPRによるapi.jsonの差分 差分はこちら--- base
+++ head
@@ -6453,6 +6453,15 @@
}
}
},
+ "UNSUPPORTED_FILE_TYPE": {
+ "value": {
+ "error": {
+ "message": "Unsupported file type.",
+ "code": "UNSUPPORTED_FILE_TYPE",
+ "id": "f7599d96-8750-af68-1633-9575d625c1a7"
+ }
+ }
+ },
"DUPLICATE_NAME": {
"value": {
"error": {
@@ -8482,6 +8491,295 @@
}
}
},
+ "/v2/admin/emoji/list": {
+ "post": {
+ "operationId": "v2___admin___emoji___list",
+ "summary": "v2/admin/emoji/list",
+ "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *read:admin:emoji*",
+ "externalDocs": {
+ "description": "Source code",
+ "url": "https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/v2/admin/emoji/list.ts"
+ },
+ "tags": [
+ "admin"
+ ],
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ],
+ "requestBody": {
+ "required": true,
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "query": {
+ "type": [
+ "object",
+ "null"
+ ],
+ "properties": {
+ "updatedAtFrom": {
+ "type": "string"
+ },
+ "updatedAtTo": {
+ "type": "string"
+ },
+ "name": {
+ "type": "string"
+ },
+ "host": {
+ "type": "string"
+ },
+ "uri": {
+ "type": "string"
+ },
+ "publicUrl": {
+ "type": "string"
+ },
+ "originalUrl": {
+ "type": "string"
+ },
+ "type": {
+ "type": "string"
+ },
+ "aliases": {
+ "type": "string"
+ },
+ "category": {
+ "type": "string"
+ },
+ "license": {
+ "type": "string"
+ },
+ "isSensitive": {
+ "type": "boolean"
+ },
+ "localOnly": {
+ "type": "boolean"
+ },
+ "hostType": {
+ "type": "string",
+ "enum": [
+ "local",
+ "remote",
+ "all"
+ ],
+ "default": "all"
+ },
+ "roleIds": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "format": "misskey:id"
+ }
+ }
+ }
+ },
+ "sinceId": {
+ "type": "string",
+ "format": "misskey:id"
+ },
+ "untilId": {
+ "type": "string",
+ "format": "misskey:id"
+ },
+ "limit": {
+ "type": "integer",
+ "minimum": 1,
+ "maximum": 100,
+ "default": 10
+ },
+ "page": {
+ "type": "integer"
+ },
+ "sortKeys": {
+ "type": "array",
+ "default": [
+ "-id"
+ ],
+ "items": {
+ "type": "string",
+ "enum": [
+ "+id",
+ "-id",
+ "+updatedAt",
+ "-updatedAt",
+ "+name",
+ "-name",
+ "+host",
+ "-host",
+ "+uri",
+ "-uri",
+ "+publicUrl",
+ "-publicUrl",
+ "+type",
+ "-type",
+ "+aliases",
+ "-aliases",
+ "+category",
+ "-category",
+ "+license",
+ "-license",
+ "+isSensitive",
+ "-isSensitive",
+ "+localOnly",
+ "-localOnly",
+ "+roleIdsThatCanBeUsedThisEmojiAsReaction",
+ "-roleIdsThatCanBeUsedThisEmojiAsReaction"
+ ]
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "responses": {
+ "200": {
+ "description": "OK (with results)",
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "emojis": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "$ref": "#/components/schemas/EmojiDetailedAdmin"
+ }
+ },
+ "count": {
+ "type": "integer"
+ },
+ "allCount": {
+ "type": "integer"
+ },
+ "allPages": {
+ "type": "integer"
+ }
+ },
+ "required": [
+ "emojis",
+ "count",
+ "allCount",
+ "allPages"
+ ]
+ }
+ }
+ }
+ },
+ "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/federation/delete-all-files": {
"post": {
"operationId": "admin___federation___delete-all-files",
@@ -82164,6 +82462,110 @@
"roleIdsThatCanBeUsedThisEmojiAsReaction"
]
},
+ "EmojiDetailedAdmin": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string",
+ "format": "id"
+ },
+ "updatedAt": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "format": "date-time"
+ },
+ "name": {
+ "type": "string"
+ },
+ "host": {
+ "type": [
+ "string",
+ "null"
+ ],
+ "description": "The local host is represented with `null`."
+ },
+ "publicUrl": {
+ "type": "string"
+ },
+ "originalUrl": {
+ "type": "string"
+ },
+ "uri": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "type": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "aliases": {
+ "type": "array",
+ "items": {
+ "type": "string",
+ "format": "id"
+ }
+ },
+ "category": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "license": {
+ "type": [
+ "string",
+ "null"
+ ]
+ },
+ "localOnly": {
+ "type": "boolean"
+ },
+ "isSensitive": {
+ "type": "boolean"
+ },
+ "roleIdsThatCanBeUsedThisEmojiAsReaction": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "properties": {
+ "id": {
+ "type": "string",
+ "format": "misskey:id"
+ },
+ "name": {
+ "type": "string"
+ }
+ },
+ "required": [
+ "id",
+ "name"
+ ]
+ }
+ }
+ },
+ "required": [
+ "id",
+ "updatedAt",
+ "name",
+ "host",
+ "publicUrl",
+ "originalUrl",
+ "uri",
+ "type",
+ "aliases",
+ "category",
+ "license",
+ "localOnly",
+ "isSensitive",
+ "roleIdsThatCanBeUsedThisEmojiAsReaction"
+ ]
+ },
"Flash": {
"type": "object",
"properties": { |
|
軽く見た感じは既存の処理に影響出そうな感じはなかった |
|
デカくてまだ見れてないです |
anatawa12
reviewed
Dec 29, 2024
| builder.andWhere('emoji.id < :untilId', { untilId: params.untilId }); | ||
| } | ||
|
|
||
| if (opts?.sortKeys && opts.sortKeys.length > 0) { |
There was a problem hiding this comment.
未知のsortKeyでSQL Injectionできないかが若干こわい。
もちろん API の json validation で弾いてるっぽいけど、年のためにここで確認したくなる
(将来別のAPI等が使うようになった際に API 側の実装を忘れる可能性を否定できない)
anatawa12
approved these changes
Dec 29, 2024
|
ありがとう |
5 tasks
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
misskey-dev#13473
Why
カスタム絵文字の大掃除をしたいので
Additional info (optional)
余計な変更が紛れ込んでいないかなどが確認出来ていません！
pnpm devだけ試しました
Checklist