Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts: # package.json # packages/backend/src/core/entities/NotificationEntityService.ts # packages/backend/src/types.ts # packages/frontend/src/pages/admin/modlog.ModLog.vue # packages/misskey-js/src/consts.ts # packages/misskey-js/src/entities.ts
This commit is contained in:
@@ -231,6 +231,8 @@ import type {
|
||||
ChatMessagesSearchResponse,
|
||||
ChatMessagesShowRequest,
|
||||
ChatMessagesShowResponse,
|
||||
ChatMessagesUnreactRequest,
|
||||
ChatMessagesUnreactResponse,
|
||||
ChatMessagesUserTimelineRequest,
|
||||
ChatMessagesUserTimelineResponse,
|
||||
ChatRoomsCreateRequest,
|
||||
@@ -243,6 +245,8 @@ import type {
|
||||
ChatRoomsInvitationsIgnoreResponse,
|
||||
ChatRoomsInvitationsInboxRequest,
|
||||
ChatRoomsInvitationsInboxResponse,
|
||||
ChatRoomsInvitationsOutboxRequest,
|
||||
ChatRoomsInvitationsOutboxResponse,
|
||||
ChatRoomsJoinRequest,
|
||||
ChatRoomsJoinResponse,
|
||||
ChatRoomsJoiningRequest,
|
||||
@@ -812,12 +816,14 @@ export type Endpoints = {
|
||||
'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/user-timeline': { req: ChatMessagesUserTimelineRequest; res: ChatMessagesUserTimelineResponse };
|
||||
'chat/rooms/create': { req: ChatRoomsCreateRequest; res: ChatRoomsCreateResponse };
|
||||
'chat/rooms/delete': { req: ChatRoomsDeleteRequest; res: ChatRoomsDeleteResponse };
|
||||
'chat/rooms/invitations/create': { req: ChatRoomsInvitationsCreateRequest; res: ChatRoomsInvitationsCreateResponse };
|
||||
'chat/rooms/invitations/ignore': { req: ChatRoomsInvitationsIgnoreRequest; res: ChatRoomsInvitationsIgnoreResponse };
|
||||
'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/joining': { req: ChatRoomsJoiningRequest; res: ChatRoomsJoiningResponse };
|
||||
'chat/rooms/leave': { req: ChatRoomsLeaveRequest; res: ChatRoomsLeaveResponse };
|
||||
|
||||
Reference in New Issue
Block a user