diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-03-26 10:54:55 -0400 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-03-26 10:54:55 -0400 |
| commit | 11e578c10dbde792dd759701ec5ebd360461430b (patch) | |
| tree | 946d32701f679b4eb34f1ebed7925540020b9d44 /packages/backend | |
| parent | restore sharkey-specific settings (diff) | |
| parent | ci(storybook): prevent running for bots (diff) | |
| download | sharkey-11e578c10dbde792dd759701ec5ebd360461430b.tar.gz sharkey-11e578c10dbde792dd759701ec5ebd360461430b.tar.bz2 sharkey-11e578c10dbde792dd759701ec5ebd360461430b.zip | |
Merge branch 'misskey-develop' into merge/2025-03-24
# Conflicts:
# .github/workflows/storybook.yml
Diffstat (limited to 'packages/backend')
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts index 27d8ee9891..c0027ae129 100644 --- a/packages/backend/src/core/GlobalEventService.ts +++ b/packages/backend/src/core/GlobalEventService.ts @@ -311,7 +311,7 @@ export type GlobalEvents = { name: 'notesStream'; payload: Serialized<Packed<'Note'>>; }; - chat: { + chatUser: { name: `chatUserStream:${MiUser['id']}-${MiUser['id']}`; payload: EventTypesToEventPayload<ChatEventTypes>; }; diff --git a/packages/backend/src/server/api/stream/channels/chat-room.ts b/packages/backend/src/server/api/stream/channels/chat-room.ts index e989969345..eda333dd30 100644 --- a/packages/backend/src/server/api/stream/channels/chat-room.ts +++ b/packages/backend/src/server/api/stream/channels/chat-room.ts @@ -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); } diff --git a/packages/backend/src/server/api/stream/channels/chat-user.ts b/packages/backend/src/server/api/stream/channels/chat-user.ts index c4e898cd5b..5323484ed7 100644 --- a/packages/backend/src/server/api/stream/channels/chat-user.ts +++ b/packages/backend/src/server/api/stream/channels/chat-user.ts @@ -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); } |