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

This commit is contained in:
Hazelnoot 2025-04-02 22:29:37 -04:00
commit 5e941385db

View file

@ -211,9 +211,15 @@ export class ChatService {
file?: MiDriveFile | null; file?: MiDriveFile | null;
uri?: string | null; uri?: string | null;
}): Promise<Packed<'ChatMessageLite'>> { }): Promise<Packed<'ChatMessageLite'>> {
const memberships = await this.chatRoomMembershipsRepository.findBy({ roomId: toRoom.id }); const memberships = (await this.chatRoomMembershipsRepository.findBy({ roomId: toRoom.id })).map(m => ({
userId: m.userId,
isMuted: m.isMuted,
})).concat({ // ownerはmembershipレコードを作らないため
userId: toRoom.ownerId,
isMuted: false,
});
if (toRoom.ownerId !== fromUser.id && !memberships.some(member => member.userId === fromUser.id)) { if (!memberships.some(member => member.userId === fromUser.id)) {
throw new Error('you are not a member of the room'); throw new Error('you are not a member of the room');
} }