Resolve #4941

4 files changed, 145 insertions, 9 deletions

diff --git a/src/server/api/endpoints/users/groups/invitations/accept.ts b/src/server/api/endpoints/users/groups/invitations/accept.ts
new file mode 100644
index 0000000000..33779dd349
--- /dev/null
+++ b/src/server/api/endpoints/users/groups/invitations/accept.ts
@@ -0,0 +1,63 @@
+import $ from 'cafy';
+import { ID } from '../../../../../../misc/cafy-id';
+import define from '../../../../define';
+import { ApiError } from '../../../../error';
+import { UserGroupJoinings, UserGroupInvites } from '../../../../../../models';
+import { genId } from '../../../../../../misc/gen-id';
+import { UserGroupJoining } from '../../../../../../models/entities/user-group-joining';
+
+export const meta = {
+	desc: {
+		'ja-JP': 'ユーザーグループへの招待を承認します。',
+		'en-US': 'Accept invite of a user group.'
+	},
+
+	tags: ['groups', 'users'],
+
+	requireCredential: true,
+
+	kind: 'write:user-groups',
+
+	params: {
+		inviteId: {
+			validator: $.type(ID),
+			desc: {
+				'ja-JP': '招待ID',
+				'en-US': 'The invite ID'
+			}
+		},
+	},
+
+	errors: {
+		noSuchInvitation: {
+			message: 'No such invitation.',
+			code: 'NO_SUCH_INVITATION',
+			id: '98c11eca-c890-4f42-9806-c8c8303ebb5e'
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	// Fetch the invitation
+	const invite = await UserGroupInvites.findOne({
+		id: ps.inviteId,
+	});
+
+	if (invite == null) {
+		throw new ApiError(meta.errors.noSuchInvitation);
+	}
+
+	if (invite.userId !== user.id) {
+		throw new ApiError(meta.errors.noSuchInvitation);
+	}
+
+	// Push the user
+	await UserGroupJoinings.save({
+		id: genId(),
+		createdAt: new Date(),
+		userId: user.id,
+		userGroupId: invite.userGroupId
+	} as UserGroupJoining);
+
+	UserGroupInvites.delete(invite.id);
+});
diff --git a/src/server/api/endpoints/users/groups/invitations/reject.ts b/src/server/api/endpoints/users/groups/invitations/reject.ts
new file mode 100644
index 0000000000..e9e7bc8b48
--- /dev/null
+++ b/src/server/api/endpoints/users/groups/invitations/reject.ts
@@ -0,0 +1,53 @@
+import $ from 'cafy';
+import { ID } from '../../../../../../misc/cafy-id';
+import define from '../../../../define';
+import { ApiError } from '../../../../error';
+import { UserGroupInvites } from '../../../../../../models';
+
+export const meta = {
+	desc: {
+		'ja-JP': 'ユーザーグループへの招待を拒否します。',
+		'en-US': 'Reject invite of a user group.'
+	},
+
+	tags: ['groups', 'users'],
+
+	requireCredential: true,
+
+	kind: 'write:user-groups',
+
+	params: {
+		inviteId: {
+			validator: $.type(ID),
+			desc: {
+				'ja-JP': '招待ID',
+				'en-US': 'The invite ID'
+			}
+		},
+	},
+
+	errors: {
+		noSuchInvitation: {
+			message: 'No such invitation.',
+			code: 'NO_SUCH_INVITATION',
+			id: 'ad7471d4-2cd9-44b4-ac68-e7136b4ce656'
+		},
+	}
+};
+
+export default define(meta, async (ps, user) => {
+	// Fetch the invitation
+	const invite = await UserGroupInvites.findOne({
+		id: ps.inviteId,
+	});
+
+	if (invite == null) {
+		throw new ApiError(meta.errors.noSuchInvitation);
+	}
+
+	if (invite.userId !== user.id) {
+		throw new ApiError(meta.errors.noSuchInvitation);
+	}
+
+	await UserGroupInvites.delete(invite.id);
+});
diff --git a/src/server/api/endpoints/users/groups/push.ts b/src/server/api/endpoints/users/groups/invite.ts
index 5371580db0..503184a92f 100644
--- a/src/server/api/endpoints/users/groups/push.ts
+++ b/src/server/api/endpoints/users/groups/invite.ts
@@ -3,14 +3,14 @@ import { ID } from '../../../../../misc/cafy-id';
 import define from '../../../define';
 import { ApiError } from '../../../error';
 import { getUser } from '../../../common/getters';
-import { UserGroups, UserGroupJoinings } from '../../../../../models';
+import { UserGroups, UserGroupJoinings, UserGroupInvites } from '../../../../../models';
 import { genId } from '../../../../../misc/gen-id';
-import { UserGroupJoining } from '../../../../../models/entities/user-group-joining';
+import { UserGroupInvite } from '../../../../../models/entities/user-group-invite';
 
 export const meta = {
 	desc: {
-		'ja-JP': '指定したユーザーグループに指定したユーザーを追加します。',
-		'en-US': 'Add a user to a user group.'
+		'ja-JP': '指定したユーザーグループに指定したユーザーを招待します。',
+		'en-US': 'Invite a user to a user group.'
 	},
 
 	tags: ['groups', 'users'],
@@ -50,6 +50,12 @@ export const meta = {
 			message: 'That user has already been added to that group.',
 			code: 'ALREADY_ADDED',
 			id: '7e35c6a0-39b2-4488-aea6-6ee20bd5da2c'
+		},
+
+		alreadyInvited: {
+			message: 'That user has already been invited to that group.',
+			code: 'ALREADY_INVITED',
+			id: 'ee0f58b4-b529-4d13-b761-b9a3e69f97e6'
 		}
 	}
 };
@@ -71,20 +77,28 @@ export default define(meta, async (ps, me) => {
 		throw e;
 	});
 
-	const exist = await UserGroupJoinings.findOne({
+	const joining = await UserGroupJoinings.findOne({
 		userGroupId: userGroup.id,
 		userId: user.id
 	});
 
-	if (exist) {
+	if (joining) {
 		throw new ApiError(meta.errors.alreadyAdded);
 	}
 
-	// Push the user
-	await UserGroupJoinings.save({
+	const invite = await UserGroupInvites.findOne({
+		userGroupId: userGroup.id,
+		userId: user.id
+	});
+
+	if (invite) {
+		throw new ApiError(meta.errors.alreadyInvited);
+	}
+
+	await UserGroupInvites.save({
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
 		userGroupId: userGroup.id
-	} as UserGroupJoining);
+	} as UserGroupInvite);
 });
diff --git a/src/server/api/endpoints/users/groups/joined.ts b/src/server/api/endpoints/users/groups/joined.ts
index 14561fce05..853a2510de 100644
--- a/src/server/api/endpoints/users/groups/joined.ts
+++ b/src/server/api/endpoints/users/groups/joined.ts
@@ -1,6 +1,7 @@
 import define from '../../../define';
 import { UserGroups, UserGroupJoinings } from '../../../../../models';
 import { types, bool } from '../../../../../misc/schema';
+import { Not, In } from 'typeorm';
 
 export const meta = {
 	desc: {
@@ -25,8 +26,13 @@ export const meta = {
 };
 
 export default define(meta, async (ps, me) => {
+	const ownedGroups = await UserGroups.find({
+		userId: me.id,
+	});
+
 	const joinings = await UserGroupJoinings.find({
 		userId: me.id,
+		userGroupId: Not(In(ownedGroups.map(x => x.id)))
 	});
 
 	return await Promise.all(joinings.map(x => UserGroups.pack(x.userGroupId)));