Merge remote-tracking branch 'misskey-original/develop' into develop

2024-01-04 14:19:28 +09:00 · 2024-01-04 14:19:28 +09:00 · 6c83f01ef4
commit 6c83f01ef4
parent 085a93b9fc 6598d320d6
44 changed files with 288 additions and 162 deletions
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@ -352,6 +352,7 @@ export class NoteEntityService implements OnModuleInit {
 				color: channel.color,
 				isSensitive: channel.isSensitive,
 				allowRenoteToExternal: channel.allowRenoteToExternal,
+				userId: channel.userId,
 			} : undefined,
 			mentions: note.mentions.length > 0 ? note.mentions : undefined,
 			uri: note.uri ?? undefined,