Merge branch 'develop' of misskey-dev into merge-upstream

2024-01-10 03:10:45 +09:00 · 2024-01-10 03:10:45 +09:00 · abe95d9b67
commit abe95d9b67
parent 83a2b947f0 7e52ea4818
376 changed files with 5293 additions and 2636 deletions
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@ -356,6 +356,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,