Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts: # .github/workflows/api-misskey-js.yml # .github/workflows/changelog-check.yml # .github/workflows/check-misskey-js-autogen.yml # .github/workflows/get-api-diff.yml # .github/workflows/lint.yml # .github/workflows/locale.yml # .github/workflows/on-release-created.yml # .github/workflows/storybook.yml # .github/workflows/test-backend.yml # .github/workflows/test-federation.yml # .github/workflows/test-frontend.yml # .github/workflows/test-misskey-js.yml # .github/workflows/test-production.yml # .github/workflows/validate-api-json.yml # package.json # packages/backend/package.json # packages/backend/src/server/api/ApiCallService.ts # packages/backend/src/server/api/endpoints/drive/files/create.ts # packages/frontend-shared/js/url.ts # packages/frontend/package.json # packages/frontend/src/components/MkFileCaptionEditWindow.vue # packages/frontend/src/components/MkInfo.vue # packages/frontend/src/components/MkLink.vue # packages/frontend/src/components/MkNote.vue # packages/frontend/src/components/MkNotes.vue # packages/frontend/src/components/MkPageWindow.vue # packages/frontend/src/components/MkReactionsViewer.vue # packages/frontend/src/components/MkTimeline.vue # packages/frontend/src/components/MkUrlPreview.vue # packages/frontend/src/components/MkUserPopup.vue # packages/frontend/src/components/global/MkPageHeader.vue # packages/frontend/src/components/global/MkUrl.vue # packages/frontend/src/components/global/PageWithHeader.vue # packages/frontend/src/pages/about-misskey.vue # packages/frontend/src/pages/announcements.vue # packages/frontend/src/pages/antenna-timeline.vue # packages/frontend/src/pages/channel.vue # packages/frontend/src/pages/instance-info.vue # packages/frontend/src/pages/note.vue # packages/frontend/src/pages/page.vue # packages/frontend/src/pages/role.vue # packages/frontend/src/pages/tag.vue # packages/frontend/src/pages/timeline.vue # packages/frontend/src/pages/user-list-timeline.vue # packages/frontend/src/pages/user/followers.vue # packages/frontend/src/pages/user/following.vue # packages/frontend/src/pages/user/home.vue # packages/frontend/src/pages/user/index.vue # packages/frontend/src/ui/deck.vue # packages/misskey-js/generator/package.json # pnpm-lock.yaml # scripts/changelog-checker/package-lock.json # scripts/changelog-checker/package.json
This commit is contained in:
@@ -228,9 +228,7 @@ import type {
|
||||
ChatMessagesCreateToUserRequest,
|
||||
ChatMessagesCreateToUserResponse,
|
||||
ChatMessagesDeleteRequest,
|
||||
ChatMessagesDeleteResponse,
|
||||
ChatMessagesReactRequest,
|
||||
ChatMessagesReactResponse,
|
||||
ChatMessagesRoomTimelineRequest,
|
||||
ChatMessagesRoomTimelineResponse,
|
||||
ChatMessagesSearchRequest,
|
||||
@@ -238,31 +236,25 @@ import type {
|
||||
ChatMessagesShowRequest,
|
||||
ChatMessagesShowResponse,
|
||||
ChatMessagesUnreactRequest,
|
||||
ChatMessagesUnreactResponse,
|
||||
ChatMessagesUserTimelineRequest,
|
||||
ChatMessagesUserTimelineResponse,
|
||||
ChatRoomsCreateRequest,
|
||||
ChatRoomsCreateResponse,
|
||||
ChatRoomsDeleteRequest,
|
||||
ChatRoomsDeleteResponse,
|
||||
ChatRoomsInvitationsCreateRequest,
|
||||
ChatRoomsInvitationsCreateResponse,
|
||||
ChatRoomsInvitationsIgnoreRequest,
|
||||
ChatRoomsInvitationsIgnoreResponse,
|
||||
ChatRoomsInvitationsInboxRequest,
|
||||
ChatRoomsInvitationsInboxResponse,
|
||||
ChatRoomsInvitationsOutboxRequest,
|
||||
ChatRoomsInvitationsOutboxResponse,
|
||||
ChatRoomsJoinRequest,
|
||||
ChatRoomsJoinResponse,
|
||||
ChatRoomsJoiningRequest,
|
||||
ChatRoomsJoiningResponse,
|
||||
ChatRoomsLeaveRequest,
|
||||
ChatRoomsLeaveResponse,
|
||||
ChatRoomsMembersRequest,
|
||||
ChatRoomsMembersResponse,
|
||||
ChatRoomsMuteRequest,
|
||||
ChatRoomsMuteResponse,
|
||||
ChatRoomsOwnedRequest,
|
||||
ChatRoomsOwnedResponse,
|
||||
ChatRoomsShowRequest,
|
||||
@@ -824,24 +816,24 @@ export type Endpoints = {
|
||||
'chat/history': { req: ChatHistoryRequest; res: ChatHistoryResponse };
|
||||
'chat/messages/create-to-room': { req: ChatMessagesCreateToRoomRequest; res: ChatMessagesCreateToRoomResponse };
|
||||
'chat/messages/create-to-user': { req: ChatMessagesCreateToUserRequest; res: ChatMessagesCreateToUserResponse };
|
||||
'chat/messages/delete': { req: ChatMessagesDeleteRequest; res: ChatMessagesDeleteResponse };
|
||||
'chat/messages/react': { req: ChatMessagesReactRequest; res: ChatMessagesReactResponse };
|
||||
'chat/messages/delete': { req: ChatMessagesDeleteRequest; res: EmptyResponse };
|
||||
'chat/messages/react': { req: ChatMessagesReactRequest; res: EmptyResponse };
|
||||
'chat/messages/room-timeline': { req: ChatMessagesRoomTimelineRequest; res: ChatMessagesRoomTimelineResponse };
|
||||
'chat/messages/search': { req: ChatMessagesSearchRequest; res: ChatMessagesSearchResponse };
|
||||
'chat/messages/show': { req: ChatMessagesShowRequest; res: ChatMessagesShowResponse };
|
||||
'chat/messages/unreact': { req: ChatMessagesUnreactRequest; res: ChatMessagesUnreactResponse };
|
||||
'chat/messages/unreact': { req: ChatMessagesUnreactRequest; res: EmptyResponse };
|
||||
'chat/messages/user-timeline': { req: ChatMessagesUserTimelineRequest; res: ChatMessagesUserTimelineResponse };
|
||||
'chat/rooms/create': { req: ChatRoomsCreateRequest; res: ChatRoomsCreateResponse };
|
||||
'chat/rooms/delete': { req: ChatRoomsDeleteRequest; res: ChatRoomsDeleteResponse };
|
||||
'chat/rooms/delete': { req: ChatRoomsDeleteRequest; res: EmptyResponse };
|
||||
'chat/rooms/invitations/create': { req: ChatRoomsInvitationsCreateRequest; res: ChatRoomsInvitationsCreateResponse };
|
||||
'chat/rooms/invitations/ignore': { req: ChatRoomsInvitationsIgnoreRequest; res: ChatRoomsInvitationsIgnoreResponse };
|
||||
'chat/rooms/invitations/ignore': { req: ChatRoomsInvitationsIgnoreRequest; res: EmptyResponse };
|
||||
'chat/rooms/invitations/inbox': { req: ChatRoomsInvitationsInboxRequest; res: ChatRoomsInvitationsInboxResponse };
|
||||
'chat/rooms/invitations/outbox': { req: ChatRoomsInvitationsOutboxRequest; res: ChatRoomsInvitationsOutboxResponse };
|
||||
'chat/rooms/join': { req: ChatRoomsJoinRequest; res: ChatRoomsJoinResponse };
|
||||
'chat/rooms/join': { req: ChatRoomsJoinRequest; res: EmptyResponse };
|
||||
'chat/rooms/joining': { req: ChatRoomsJoiningRequest; res: ChatRoomsJoiningResponse };
|
||||
'chat/rooms/leave': { req: ChatRoomsLeaveRequest; res: ChatRoomsLeaveResponse };
|
||||
'chat/rooms/leave': { req: ChatRoomsLeaveRequest; res: EmptyResponse };
|
||||
'chat/rooms/members': { req: ChatRoomsMembersRequest; res: ChatRoomsMembersResponse };
|
||||
'chat/rooms/mute': { req: ChatRoomsMuteRequest; res: ChatRoomsMuteResponse };
|
||||
'chat/rooms/mute': { req: ChatRoomsMuteRequest; res: EmptyResponse };
|
||||
'chat/rooms/owned': { req: ChatRoomsOwnedRequest; res: ChatRoomsOwnedResponse };
|
||||
'chat/rooms/show': { req: ChatRoomsShowRequest; res: ChatRoomsShowResponse };
|
||||
'chat/rooms/update': { req: ChatRoomsUpdateRequest; res: ChatRoomsUpdateResponse };
|
||||
|
||||
Reference in New Issue
Block a user