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:
#	.github/workflows/storybook.yml
This commit is contained in:
Hazelnoot 2025-03-26 10:54:55 -04:00
commit 11e578c10d
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/core/GlobalEventService.ts
View file

@ -311,7 +311,7 @@ export type GlobalEvents = {
name: 'notesStream';
payload: Serialized<Packed<'Note'>>;
};
chat: {
chatUser: {
name: `chatUserStream:${MiUser['id']}-${MiUser['id']}`;
payload: EventTypesToEventPayload<ChatEventTypes>;
};

2
packages/backend/src/server/api/stream/channels/chat-room.ts
View file

@ -35,7 +35,7 @@ class ChatRoomChannel extends Channel {
}
@bindThis
private async onEvent(data: GlobalEvents['chat']['payload']) {
private async onEvent(data: GlobalEvents['chatRoom']['payload']) {
this.send(data.type, data.body);
}

2
packages/backend/src/server/api/stream/channels/chat-user.ts
View file

@ -35,7 +35,7 @@ class ChatUserChannel extends Channel {
}
@bindThis
private async onEvent(data: GlobalEvents['chat']['payload']) {
private async onEvent(data: GlobalEvents['chatUser']['payload']) {
this.send(data.type, data.body);
}