Merge 2024.2.0 beta .13 #15
Closed
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
* chore: Add the SPDX information to each file Add copyright and licensing information as defined in version 3.0 of the REUSE Specification. * tweak format --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
…y-dev#11433) * fix(frontend): 未読のお知らせの「わかった」をクリック・タップしてもその場で「わかった」が消えない問題を修正 * remove comment * clean up * ✌️ * add CHANGELOG
* Remove unused injections * Remove unused imports
* メニューのトグルをいい感じにする * user list toggle! * add changelog * fix * stop
…isskey-dev#11441) * fix(frontend): MkPopupMenuがドロワーで子メニューの出現と同時にpopupをresolveさせるのをやめさせる * fix * noCache * ✌️ * fix * ???? * a * a * ✌️ * fix emoji picker * ????? * close * 1 * fix2 * ✌️ * fix * ✌️ * ✌️ * ✌️ * preferClick * ✌️ * fix lint * a * rm nocache
* wip * Update read-announcement.ts * wip * wip * wip * Update index.d.ts * wip * Create 1691649257651-refine-announcement.js * wip * wip * wip * wip * wip * wip * Update announcements.vue * wip * wip * Update announcements.vue * wip * Update announcements.vue * wip * Update misskey-js.api.md * Update users.ts * Create MkAnnouncementDialog.stories.impl.ts * wip * wip * Create AnnouncementService.ts
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
feat(frontend): selectable compression kind
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
chore: センシティブチャンネルのNoteがたたまれる方法がCWになりました
feat(backend): exclude good-night notes
feat(frontend): add about this fork in about misskey
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
Delete user log
# Conflicts: # CHANGELOG.md # locales/index.d.ts # package.json # packages/backend/src/core/activitypub/ApInboxService.ts # packages/backend/src/models/RepositoryModule.ts # packages/backend/src/server/api/endpoints/i/webhooks/create.ts # packages/backend/src/server/api/endpoints/i/webhooks/list.ts # packages/backend/src/server/api/endpoints/i/webhooks/show.ts # packages/frontend/src/components/MkNote.vue # packages/frontend/src/components/MkUpdated.vue # packages/frontend/src/pages/settings/drive.vue # packages/frontend/src/pages/settings/webhook.edit.vue # packages/frontend/src/scripts/get-note-summary.ts # packages/frontend/src/scripts/upload/compress-config.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 # pnpm-lock.yaml
|
このPRによるapi.jsonの差分 差分はこちら--- base
+++ head
@@ -17,6 +17,197 @@
}
],
"paths": {
+ "/admin/nirila-delete-user-log-access": {
+ "post": {
+ "operationId": "admin/nirila-delete-user-log-access",
+ "summary": "admin/nirila-delete-user-log-access",
+ "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *read:admin:nirila-delete-user-log-access*",
+ "externalDocs": {
+ "description": "Source code",
+ "url": "https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/admin/nirila-delete-user-log-access.ts"
+ },
+ "tags": [
+ "admin"
+ ],
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ],
+ "requestBody": {
+ "required": true,
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "limit": {
+ "type": "integer",
+ "minimum": 1,
+ "maximum": 100,
+ "default": 10
+ },
+ "sinceId": {
+ "type": "string",
+ "format": "misskey:id"
+ },
+ "untilId": {
+ "type": "string",
+ "format": "misskey:id"
+ },
+ "email": {
+ "type": "string"
+ },
+ "username": {
+ "type": "string"
+ },
+ "userId": {
+ "type": "string",
+ "format": "misskey:id"
+ }
+ }
+ }
+ }
+ }
+ },
+ "responses": {
+ "200": {
+ "description": "OK (with results)",
+ "content": {
+ "application/json": {
+ "schema": {
+ "oneOf": [
+ {
+ "type": "object"
+ },
+ {
+ "type": "array",
+ "items": {
+ "type": "object"
+ }
+ }
+ ]
+ }
+ }
+ }
+ },
+ "400": {
+ "description": "Client error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "NOT_FOUND": {
+ "value": {
+ "error": {
+ "message": "DeleteLog satisfies the request not found",
+ "code": "NOT_FOUND",
+ "id": "d29927d1-5b8c-4200-aa05-5537722ee7ab"
+ }
+ }
+ },
+ "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/meta": {
"post": {
"operationId": "admin/meta",
@@ -10206,6 +10397,172 @@
}
}
},
+ "/admin/note-public-to-home": {
+ "post": {
+ "operationId": "admin/note-public-to-home",
+ "summary": "admin/note-public-to-home",
+ "description": "No description provided.\n\n**Credential required**: *Yes* / **Permission**: *write:notes*",
+ "externalDocs": {
+ "description": "Source code",
+ "url": "https://github.com/misskey-dev/misskey/blob/develop/packages/backend/src/server/api/endpoints/admin/note-public-to-home.ts"
+ },
+ "tags": [
+ "admin"
+ ],
+ "security": [
+ {
+ "bearerAuth": []
+ }
+ ],
+ "requestBody": {
+ "required": true,
+ "content": {
+ "application/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "noteId": {
+ "type": "string",
+ "format": "misskey:id"
+ }
+ },
+ "required": [
+ "noteId"
+ ]
+ }
+ }
+ }
+ },
+ "responses": {
+ "204": {
+ "description": "OK (without any results)"
+ },
+ "400": {
+ "description": "Client error",
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/Error"
+ },
+ "examples": {
+ "NOTE_NOT_FOUND": {
+ "value": {
+ "error": {
+ "message": "Note not found.",
+ "code": "NOTE_NOT_FOUND",
+ "id": "b107f543-27fb-4bac-9549-9bbb64d95e85"
+ }
+ }
+ },
+ "NOTE_NOT_PUBLIC": {
+ "value": {
+ "error": {
+ "message": "Note is not public",
+ "code": "NOTE_NOT_PUBLIC",
+ "id": "561e3371-6ef1-457b-8fdc-736a6e914782"
+ }
+ }
+ },
+ "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/resolve-abuse-user-report": {
"post": {
"operationId": "admin/resolve-abuse-user-report",
@@ -48750,16 +49107,24 @@
"on": {
"type": "array",
"items": {
- "type": "string",
- "enum": [
- "mention",
- "unfollow",
- "follow",
- "followed",
- "note",
- "reply",
- "renote",
- "reaction"
+ "oneOf": [
+ {
+ "type": "string",
+ "enum": [
+ "mention",
+ "unfollow",
+ "follow",
+ "followed",
+ "note",
+ "reply",
+ "renote",
+ "reaction"
+ ]
+ },
+ {
+ "type": "string",
+ "pattern": "^note@[a-zA-Z0-9]{1,20}$"
+ }
]
}
}
@@ -48795,16 +49160,24 @@
"on": {
"type": "array",
"items": {
- "type": "string",
- "enum": [
- "mention",
- "unfollow",
- "follow",
- "followed",
- "note",
- "reply",
- "renote",
- "reaction"
+ "oneOf": [
+ {
+ "type": "string",
+ "enum": [
+ "mention",
+ "unfollow",
+ "follow",
+ "followed",
+ "note",
+ "reply",
+ "renote",
+ "reaction"
+ ]
+ },
+ {
+ "type": "string",
+ "pattern": "^note@[a-zA-Z0-9]{1,20}$"
+ }
]
}
},
@@ -48863,6 +49236,15 @@
}
}
},
+ "ADMIN_WEBHOOK_DENIED": {
+ "value": {
+ "error": {
+ "message": "You cannot create webhook for other users.",
+ "code": "ADMIN_WEBHOOK_DENIED",
+ "id": "0d3321b1-6f66-41aa-9fbe-233c60ce19b0"
+ }
+ }
+ },
"INVALID_PARAM": {
"value": {
"error": {
@@ -49004,16 +49386,24 @@
"on": {
"type": "array",
"items": {
- "type": "string",
- "enum": [
- "mention",
- "unfollow",
- "follow",
- "followed",
- "note",
- "reply",
- "renote",
- "reaction"
+ "oneOf": [
+ {
+ "type": "string",
+ "enum": [
+ "mention",
+ "unfollow",
+ "follow",
+ "followed",
+ "note",
+ "reply",
+ "renote",
+ "reaction"
+ ]
+ },
+ {
+ "type": "string",
+ "pattern": "^note@[a-zA-Z0-9]{1,20}$"
+ }
]
}
},
@@ -49222,16 +49612,24 @@
"on": {
"type": "array",
"items": {
- "type": "string",
- "enum": [
- "mention",
- "unfollow",
- "follow",
- "followed",
- "note",
- "reply",
- "renote",
- "reaction"
+ "oneOf": [
+ {
+ "type": "string",
+ "enum": [
+ "mention",
+ "unfollow",
+ "follow",
+ "followed",
+ "note",
+ "reply",
+ "renote",
+ "reaction"
+ ]
+ },
+ {
+ "type": "string",
+ "pattern": "^note@[a-zA-Z0-9]{1,20}$"
+ }
]
}
},
@@ -49436,16 +49834,24 @@
"on": {
"type": "array",
"items": {
- "type": "string",
- "enum": [
- "mention",
- "unfollow",
- "follow",
- "followed",
- "note",
- "reply",
- "renote",
- "reaction"
+ "oneOf": [
+ {
+ "type": "string",
+ "enum": [
+ "mention",
+ "unfollow",
+ "follow",
+ "followed",
+ "note",
+ "reply",
+ "renote",
+ "reaction"
+ ]
+ },
+ {
+ "type": "string",
+ "pattern": "^note@[a-zA-Z0-9]{1,20}$"
+ }
]
}
},
@@ -49485,6 +49891,15 @@
}
}
},
+ "UPDATE_ADMIN_WEBHOOK_DENIED": {
+ "value": {
+ "error": {
+ "message": "You cannot create webhook for other users.",
+ "code": "UPDATE_ADMIN_WEBHOOK_DENIED",
+ "id": "eb43c0c4-24a3-487d-b139-f3e4e58f87a4"
+ }
+ }
+ },
"INVALID_PARAM": {
"value": {
"error": {
@@ -69253,6 +69668,9 @@
"withFiles": {
"type": "boolean",
"default": false
+ },
+ "includeSensitiveChannel": {
+ "type": "boolean"
}
},
"required": [ |
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
Why
Additional info (optional)
Checklist