1 files changed, 86 insertions, 19 deletions
diff --git a/src/server/api/endpoints/messaging/messages.ts b/src/server/api/endpoints/messaging/messages.ts
index 0d5295bff3..c1e79cd130 100644
--- a/src/server/api/endpoints/messaging/messages.ts
+++ b/src/server/api/endpoints/messaging/messages.ts
@@ -1,16 +1,17 @@
 import $ from 'cafy';
 import { ID } from '../../../../misc/cafy-id';
-import read from '../../common/read-messaging-message';
 import define from '../../define';
 import { ApiError } from '../../error';
 import { getUser } from '../../common/getters';
-import { MessagingMessages } from '../../../../models';
+import { MessagingMessages, UserGroups, UserGroupJoinings } from '../../../../models';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { types, bool } from '../../../../misc/schema';
+import { Brackets } from 'typeorm';
+import { readUserMessagingMessage, readGroupMessagingMessage } from '../../common/read-messaging-message';
 
 export const meta = {
 	desc: {
-		'ja-JP': '指定したユーザーとのMessagingのメッセージ一覧を取得します。',
+		'ja-JP': 'トークメッセージ一覧を取得します。',
 		'en-US': 'Get messages of messaging.'
 	},
 
@@ -22,13 +23,21 @@ export const meta = {
 
 	params: {
 		userId: {
-			validator: $.type(ID),
+			validator: $.optional.type(ID),
 			desc: {
 				'ja-JP': '対象のユーザーのID',
 				'en-US': 'Target user ID'
 			}
 		},
 
+		groupId: {
+			validator: $.optional.type(ID),
+			desc: {
+				'ja-JP': '対象のグループのID',
+				'en-US': 'Target group ID'
+			}
+		},
+
 		limit: {
 			validator: $.optional.num.range(1, 100),
 			default: 10
@@ -64,27 +73,85 @@ export const meta = {
 			code: 'NO_SUCH_USER',
 			id: '11795c64-40ea-4198-b06e-3c873ed9039d'
 		},
+
+		noSuchGroup: {
+			message: 'No such group.',
+			code: 'NO_SUCH_GROUP',
+			id: 'c4d9f88c-9270-4632-b032-6ed8cee36f7f'
+		},
+
+		groupAccessDenied: {
+			message: 'You can not read messages of groups that you have not joined.',
+			code: 'GROUP_ACCESS_DENIED',
+			id: 'a053a8dd-a491-4718-8f87-50775aad9284'
+		},
 	}
 };
 
 export default define(meta, async (ps, user) => {
-	// Fetch recipient
-	const recipient = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
-		throw e;
-	});
+	if (ps.userId != null) {
+		// Fetch recipient (user)
+		const recipient = await getUser(ps.userId).catch(e => {
+			if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+			throw e;
+		});
 
-	const query = makePaginationQuery(MessagingMessages.createQueryBuilder('message'), ps.sinceId, ps.untilId)
-		.andWhere(`(message.userId = :meId AND message.recipientId = :recipientId) OR (message.userId = :recipientId AND message.recipientId = :meId)`, { meId: user.id, recipientId: recipient.id });
+		const query = makePaginationQuery(MessagingMessages.createQueryBuilder('message'), ps.sinceId, ps.untilId)
+			.andWhere(new Brackets(qb => { qb
+				.where(new Brackets(qb => { qb
+					.where('message.userId = :meId')
+					.andWhere('message.recipientId = :recipientId');
+				}))
+				.orWhere(new Brackets(qb => { qb
+					.where('message.userId = :recipientId')
+					.andWhere('message.recipientId = :meId');
+				}));
+			}))
+			.setParameter('meId', user.id)
+			.setParameter('recipientId', recipient.id);
 
-	const messages = await query.getMany();
+		const messages = await query.take(ps.limit!).getMany();
 
-	// Mark all as read
-	if (ps.markAsRead) {
-		read(user.id, recipient.id, messages.map(x => x.id));
-	}
+		// Mark all as read
+		if (ps.markAsRead) {
+			readUserMessagingMessage(user.id, recipient.id, messages.map(x => x.id));
+		}
 
-	return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, {
-		populateRecipient: false
-	})));
+		return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, {
+			populateRecipient: false
+		})));
+	} else if (ps.groupId != null) {
+		// Fetch recipient (group)
+		const recipientGroup = await UserGroups.findOne(ps.groupId);
+
+		if (recipientGroup == null) {
+			throw new ApiError(meta.errors.noSuchGroup);
+		}
+
+		// check joined
+		const joining = await UserGroupJoinings.findOne({
+			userId: user.id,
+			userGroupId: recipientGroup.id
+		});
+
+		if (joining == null) {
+			throw new ApiError(meta.errors.groupAccessDenied);
+		}
+
+		const query = makePaginationQuery(MessagingMessages.createQueryBuilder('message'), ps.sinceId, ps.untilId)
+			.andWhere(`message.groupId = :groupId`, { groupId: recipientGroup.id });
+
+		const messages = await query.take(ps.limit!).getMany();
+
+		// Mark all as read
+		if (ps.markAsRead) {
+			readGroupMessagingMessage(user.id, recipientGroup.id, messages.map(x => x.id));
+		}
+
+		return await Promise.all(messages.map(message => MessagingMessages.pack(message, user, {
+			populateGroup: false
+		})));
+	} else {
+		throw new Error();
+	}
 });