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

# Conflicts:
#	.github/workflows/storybook.yml

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>;
 	};

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);
 	}
 

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);
 	}