misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'misskey-develop' into merge/2025-03-24

Browse source 
# Conflicts:
#	package.json
#	packages/backend/src/core/AccountMoveService.ts
#	packages/frontend/src/components/MkDateSeparatedList.vue
#	packages/misskey-js/etc/misskey-js.api.md
#	pnpm-lock.yaml
This commit is contained in:
Hazelnoot 2025-04-03 22:04:11 -04:00
commit 3eeb53ff63
74 changed files with 622 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/misskey-js/src/autogen/models.ts
View file

@ -56,6 +56,8 @@ export type SystemWebhook = components['schemas']['SystemWebhook'];
export type AbuseReportNotificationRecipient = components['schemas']['AbuseReportNotificationRecipient'];
export type ChatMessage = components['schemas']['ChatMessage'];
export type ChatMessageLite = components['schemas']['ChatMessageLite'];
export type ChatMessageLiteFor1on1 = components['schemas']['ChatMessageLiteFor1on1'];
export type ChatMessageLiteForRoom = components['schemas']['ChatMessageLiteForRoom'];
export type ChatRoom = components['schemas']['ChatRoom'];
export type ChatRoomInvitation = components['schemas']['ChatRoomInvitation'];
export type ChatRoomMembership = components['schemas']['ChatRoomMembership'];

46
packages/misskey-js/src/autogen/types.ts
View file

@ -5405,6 +5405,8 @@ export type components = {
/** @example false */
asBadge: boolean;
/** @example false */
preserveAssignmentOnMoveAccount: boolean;
/** @example false */
canEditMembersByModerator: boolean;
policies: {
[key: string]: {
@ -5693,10 +5695,10 @@ export type components = {
fileId?: string | null;
file?: components['schemas']['DriveFile'] | null;
isRead?: boolean;
reactions: ({
reactions: {
reaction: string;
user?: components['schemas']['UserLite'] | null;
})[];
user: components['schemas']['UserLite'];
}[];
};
ChatMessageLite: {
id: string;
@ -5714,6 +5716,34 @@ export type components = {
user?: components['schemas']['UserLite'] | null;
})[];
};
ChatMessageLiteFor1on1: {
id: string;
/** Format: date-time */
createdAt: string;
fromUserId: string;
toUserId: string;
text?: string | null;
fileId?: string | null;
file?: components['schemas']['DriveFile'] | null;
reactions: {
reaction: string;
}[];
};
ChatMessageLiteForRoom: {
id: string;
/** Format: date-time */
createdAt: string;
fromUserId: string;
fromUser: components['schemas']['UserLite'];
toRoomId: string;
text?: string | null;
fileId?: string | null;
file?: components['schemas']['DriveFile'] | null;
reactions: {
reaction: string;
user: components['schemas']['UserLite'];
}[];
};
ChatRoom: {
id: string;
/** Format: date-time */
@ -9983,6 +10013,7 @@ export type operations = {
/** @default false */
isExplorable?: boolean;
asBadge: boolean;
preserveAssignmentOnMoveAccount?: boolean;
canEditMembersByModerator: boolean;
displayOrder: number;
policies: Record<string, never>;
@ -10258,6 +10289,7 @@ export type operations = {
isAdministrator?: boolean;
isExplorable?: boolean;
asBadge?: boolean;
preserveAssignmentOnMoveAccount?: boolean;
canEditMembersByModerator?: boolean;
displayOrder?: number;
policies?: Record<string, never>;
@ -15108,7 +15140,7 @@ export type operations = {
/** @description OK (with results) */
200: {
content: {
'application/json': components['schemas']['ChatMessageLite'];
'application/json': components['schemas']['ChatMessageLiteForRoom'];
};
};
/** @description Client error */
@ -15171,7 +15203,7 @@ export type operations = {
/** @description OK (with results) */
200: {
content: {
'application/json': components['schemas']['ChatMessageLite'];
'application/json': components['schemas']['ChatMessageLiteFor1on1'];
};
};
/** @description Client error */
@ -15346,7 +15378,7 @@ export type operations = {
/** @description OK (with results) */
200: {
content: {
'application/json': components['schemas']['ChatMessageLite'][];
'application/json': components['schemas']['ChatMessageLiteForRoom'][];
};
};
/** @description Client error */
@ -15574,7 +15606,7 @@ export type operations = {
/** @description OK (with results) */
200: {
content: {
'application/json': components['schemas']['ChatMessageLite'][];
'application/json': components['schemas']['ChatMessageLiteFor1on1'][];
};
};
/** @description Client error */

51
packages/misskey-js/src/streaming.types.ts
View file

@ -1,6 +1,7 @@
import {
Antenna,
ChatMessage,
ChatMessageLite,
DriveFile,
DriveFolder,
Note,
@ -243,7 +244,55 @@ export type Channels = {
updateSettings: ReversiUpdateSettings<ReversiUpdateKey>;
claimTimeIsUp: null | Record<string, never>;
}
}
};
chatUser: {
params: {
otherId: string;
};
events: {
message: (payload: ChatMessageLite) => void;
deleted: (payload: ChatMessageLite['id']) => void;
react: (payload: {
reaction: string;
user?: UserLite;
messageId: ChatMessageLite['id'];
}) => void;
unreact: (payload: {
reaction: string;
user?: UserLite;
messageId: ChatMessageLite['id'];
}) => void;
};
receives: {
read: {
id: ChatMessageLite['id'];
};
};
};
chatRoom: {
params: {
roomId: string;
};
events: {
message: (payload: ChatMessageLite) => void;
deleted: (payload: ChatMessageLite['id']) => void;
react: (payload: {
reaction: string;
user?: UserLite;
messageId: ChatMessageLite['id'];
}) => void;
unreact: (payload: {
reaction: string;
user?: UserLite;
messageId: ChatMessageLite['id'];
}) => void;
};
receives: {
read: {
id: ChatMessageLite['id'];
};
};
};
};
export type NoteUpdatedEvent = { id: Note['id'] } & ({