refactoring

Resolve #7779

12 files changed, 0 insertions, 661 deletions

diff --git a/src/server/api/endpoints/users/groups/create.ts b/src/server/api/endpoints/users/groups/create.ts
deleted file mode 100644
index dc1ee3879e..0000000000
--- a/src/server/api/endpoints/users/groups/create.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import $ from 'cafy';
-import define from '../../../define';
-import { UserGroups, UserGroupJoinings } from '@/models/index';
-import { genId } from '@/misc/gen-id';
-import { UserGroup } from '@/models/entities/user-group';
-import { UserGroupJoining } from '@/models/entities/user-group-joining';
-
-export const meta = {
-	tags: ['groups'],
-
-	requireCredential: true as const,
-
-	kind: 'write:user-groups',
-
-	params: {
-		name: {
-			validator: $.str.range(1, 100)
-		}
-	},
-
-	res: {
-		type: 'object' as const,
-		optional: false as const, nullable: false as const,
-		ref: 'UserGroup',
-	},
-};
-
-export default define(meta, async (ps, user) => {
-	const userGroup = await UserGroups.insert({
-		id: genId(),
-		createdAt: new Date(),
-		userId: user.id,
-		name: ps.name,
-	} as UserGroup).then(x => UserGroups.findOneOrFail(x.identifiers[0]));
-
-	// Push the owner
-	await UserGroupJoinings.insert({
-		id: genId(),
-		createdAt: new Date(),
-		userId: user.id,
-		userGroupId: userGroup.id
-	} as UserGroupJoining);
-
-	return await UserGroups.pack(userGroup);
-});
diff --git a/src/server/api/endpoints/users/groups/delete.ts b/src/server/api/endpoints/users/groups/delete.ts
deleted file mode 100644
index 7da1b4a273..0000000000
--- a/src/server/api/endpoints/users/groups/delete.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import $ from 'cafy';
-import { ID } from '@/misc/cafy-id';
-import define from '../../../define';
-import { ApiError } from '../../../error';
-import { UserGroups } from '@/models/index';
-
-export const meta = {
-	tags: ['groups'],
-
-	requireCredential: true as const,
-
-	kind: 'write:user-groups',
-
-	params: {
-		groupId: {
-			validator: $.type(ID),
-		}
-	},
-
-	errors: {
-		noSuchGroup: {
-			message: 'No such group.',
-			code: 'NO_SUCH_GROUP',
-			id: '63dbd64c-cd77-413f-8e08-61781e210b38'
-		}
-	}
-};
-
-export default define(meta, async (ps, user) => {
-	const userGroup = await UserGroups.findOne({
-		id: ps.groupId,
-		userId: user.id
-	});
-
-	if (userGroup == null) {
-		throw new ApiError(meta.errors.noSuchGroup);
-	}
-
-	await UserGroups.delete(userGroup.id);
-});
diff --git a/src/server/api/endpoints/users/groups/invitations/accept.ts b/src/server/api/endpoints/users/groups/invitations/accept.ts
deleted file mode 100644
index 09e6ae2647..0000000000
--- a/src/server/api/endpoints/users/groups/invitations/accept.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import $ from 'cafy';
-import { ID } from '@/misc/cafy-id';
-import define from '../../../../define';
-import { ApiError } from '../../../../error';
-import { UserGroupJoinings, UserGroupInvitations } from '@/models/index';
-import { genId } from '@/misc/gen-id';
-import { UserGroupJoining } from '@/models/entities/user-group-joining';
-
-export const meta = {
-	tags: ['groups', 'users'],
-
-	requireCredential: true as const,
-
-	kind: 'write:user-groups',
-
-	params: {
-		invitationId: {
-			validator: $.type(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 invitation = await UserGroupInvitations.findOne({
-		id: ps.invitationId,
-	});
-
-	if (invitation == null) {
-		throw new ApiError(meta.errors.noSuchInvitation);
-	}
-
-	if (invitation.userId !== user.id) {
-		throw new ApiError(meta.errors.noSuchInvitation);
-	}
-
-	// Push the user
-	await UserGroupJoinings.insert({
-		id: genId(),
-		createdAt: new Date(),
-		userId: user.id,
-		userGroupId: invitation.userGroupId
-	} as UserGroupJoining);
-
-	UserGroupInvitations.delete(invitation.id);
-});
diff --git a/src/server/api/endpoints/users/groups/invitations/reject.ts b/src/server/api/endpoints/users/groups/invitations/reject.ts
deleted file mode 100644
index 741fcefb35..0000000000
--- a/src/server/api/endpoints/users/groups/invitations/reject.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import $ from 'cafy';
-import { ID } from '@/misc/cafy-id';
-import define from '../../../../define';
-import { ApiError } from '../../../../error';
-import { UserGroupInvitations } from '@/models/index';
-
-export const meta = {
-	tags: ['groups', 'users'],
-
-	requireCredential: true as const,
-
-	kind: 'write:user-groups',
-
-	params: {
-		invitationId: {
-			validator: $.type(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 invitation = await UserGroupInvitations.findOne({
-		id: ps.invitationId,
-	});
-
-	if (invitation == null) {
-		throw new ApiError(meta.errors.noSuchInvitation);
-	}
-
-	if (invitation.userId !== user.id) {
-		throw new ApiError(meta.errors.noSuchInvitation);
-	}
-
-	await UserGroupInvitations.delete(invitation.id);
-});
diff --git a/src/server/api/endpoints/users/groups/invite.ts b/src/server/api/endpoints/users/groups/invite.ts
deleted file mode 100644
index f1ee8bf8b7..0000000000
--- a/src/server/api/endpoints/users/groups/invite.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import $ from 'cafy';
-import { ID } from '@/misc/cafy-id';
-import define from '../../../define';
-import { ApiError } from '../../../error';
-import { getUser } from '../../../common/getters';
-import { UserGroups, UserGroupJoinings, UserGroupInvitations } from '@/models/index';
-import { genId } from '@/misc/gen-id';
-import { UserGroupInvitation } from '@/models/entities/user-group-invitation';
-import { createNotification } from '@/services/create-notification';
-
-export const meta = {
-	tags: ['groups', 'users'],
-
-	requireCredential: true as const,
-
-	kind: 'write:user-groups',
-
-	params: {
-		groupId: {
-			validator: $.type(ID),
-		},
-
-		userId: {
-			validator: $.type(ID),
-		},
-	},
-
-	errors: {
-		noSuchGroup: {
-			message: 'No such group.',
-			code: 'NO_SUCH_GROUP',
-			id: '583f8bc0-8eee-4b78-9299-1e14fc91e409'
-		},
-
-		noSuchUser: {
-			message: 'No such user.',
-			code: 'NO_SUCH_USER',
-			id: 'da52de61-002c-475b-90e1-ba64f9cf13a8'
-		},
-
-		alreadyAdded: {
-			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'
-		}
-	}
-};
-
-export default define(meta, async (ps, me) => {
-	// Fetch the group
-	const userGroup = await UserGroups.findOne({
-		id: ps.groupId,
-		userId: me.id,
-	});
-
-	if (userGroup == null) {
-		throw new ApiError(meta.errors.noSuchGroup);
-	}
-
-	// Fetch the user
-	const user = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
-		throw e;
-	});
-
-	const joining = await UserGroupJoinings.findOne({
-		userGroupId: userGroup.id,
-		userId: user.id
-	});
-
-	if (joining) {
-		throw new ApiError(meta.errors.alreadyAdded);
-	}
-
-	const existInvitation = await UserGroupInvitations.findOne({
-		userGroupId: userGroup.id,
-		userId: user.id
-	});
-
-	if (existInvitation) {
-		throw new ApiError(meta.errors.alreadyInvited);
-	}
-
-	const invitation = await UserGroupInvitations.insert({
-		id: genId(),
-		createdAt: new Date(),
-		userId: user.id,
-		userGroupId: userGroup.id
-	} as UserGroupInvitation).then(x => UserGroupInvitations.findOneOrFail(x.identifiers[0]));
-
-	// 通知を作成
-	createNotification(user.id, 'groupInvited', {
-		notifierId: me.id,
-		userGroupInvitationId: invitation.id
-	});
-});
diff --git a/src/server/api/endpoints/users/groups/joined.ts b/src/server/api/endpoints/users/groups/joined.ts
deleted file mode 100644
index d5e8fe4032..0000000000
--- a/src/server/api/endpoints/users/groups/joined.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import define from '../../../define';
-import { UserGroups, UserGroupJoinings } from '@/models/index';
-import { Not, In } from 'typeorm';
-
-export const meta = {
-	tags: ['groups', 'account'],
-
-	requireCredential: true as const,
-
-	kind: 'read:user-groups',
-
-	res: {
-		type: 'array' as const,
-		optional: false as const, nullable: false as const,
-		items: {
-			type: 'object' as const,
-			optional: false as const, nullable: false as const,
-			ref: 'UserGroup',
-		}
-	},
-};
-
-export default define(meta, async (ps, me) => {
-	const ownedGroups = await UserGroups.find({
-		userId: me.id,
-	});
-
-	const joinings = await UserGroupJoinings.find({
-		userId: me.id,
-		...(ownedGroups.length > 0 ? {
-			userGroupId: Not(In(ownedGroups.map(x => x.id)))
-		} : {})
-	});
-
-	return await Promise.all(joinings.map(x => UserGroups.pack(x.userGroupId)));
-});
diff --git a/src/server/api/endpoints/users/groups/leave.ts b/src/server/api/endpoints/users/groups/leave.ts
deleted file mode 100644
index 0e52f2abdf..0000000000
--- a/src/server/api/endpoints/users/groups/leave.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import $ from 'cafy';
-import { ID } from '@/misc/cafy-id';
-import define from '../../../define';
-import { ApiError } from '../../../error';
-import { UserGroups, UserGroupJoinings } from '@/models/index';
-
-export const meta = {
-	tags: ['groups', 'users'],
-
-	requireCredential: true as const,
-
-	kind: 'write:user-groups',
-
-	params: {
-		groupId: {
-			validator: $.type(ID),
-		},
-	},
-
-	errors: {
-		noSuchGroup: {
-			message: 'No such group.',
-			code: 'NO_SUCH_GROUP',
-			id: '62780270-1f67-5dc0-daca-3eb510612e31'
-		},
-
-		youAreOwner: {
-			message: 'Your are the owner.',
-			code: 'YOU_ARE_OWNER',
-			id: 'b6d6e0c2-ef8a-9bb8-653d-79f4a3107c69'
-		},
-	}
-};
-
-export default define(meta, async (ps, me) => {
-	// Fetch the group
-	const userGroup = await UserGroups.findOne({
-		id: ps.groupId,
-	});
-
-	if (userGroup == null) {
-		throw new ApiError(meta.errors.noSuchGroup);
-	}
-
-	if (me.id === userGroup.userId) {
-		throw new ApiError(meta.errors.youAreOwner);
-	}
-
-	await UserGroupJoinings.delete({ userGroupId: userGroup.id, userId: me.id });
-});
diff --git a/src/server/api/endpoints/users/groups/owned.ts b/src/server/api/endpoints/users/groups/owned.ts
deleted file mode 100644
index 17de370dbc..0000000000
--- a/src/server/api/endpoints/users/groups/owned.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import define from '../../../define';
-import { UserGroups } from '@/models/index';
-
-export const meta = {
-	tags: ['groups', 'account'],
-
-	requireCredential: true as const,
-
-	kind: 'read:user-groups',
-
-	res: {
-		type: 'array' as const,
-		optional: false as const, nullable: false as const,
-		items: {
-			type: 'object' as const,
-			optional: false as const, nullable: false as const,
-			ref: 'UserGroup',
-		}
-	},
-};
-
-export default define(meta, async (ps, me) => {
-	const userGroups = await UserGroups.find({
-		userId: me.id,
-	});
-
-	return await Promise.all(userGroups.map(x => UserGroups.pack(x)));
-});
diff --git a/src/server/api/endpoints/users/groups/pull.ts b/src/server/api/endpoints/users/groups/pull.ts
deleted file mode 100644
index ce4d2e2881..0000000000
--- a/src/server/api/endpoints/users/groups/pull.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import $ from 'cafy';
-import { ID } from '@/misc/cafy-id';
-import define from '../../../define';
-import { ApiError } from '../../../error';
-import { getUser } from '../../../common/getters';
-import { UserGroups, UserGroupJoinings } from '@/models/index';
-
-export const meta = {
-	tags: ['groups', 'users'],
-
-	requireCredential: true as const,
-
-	kind: 'write:user-groups',
-
-	params: {
-		groupId: {
-			validator: $.type(ID),
-		},
-
-		userId: {
-			validator: $.type(ID),
-		},
-	},
-
-	errors: {
-		noSuchGroup: {
-			message: 'No such group.',
-			code: 'NO_SUCH_GROUP',
-			id: '4662487c-05b1-4b78-86e5-fd46998aba74'
-		},
-
-		noSuchUser: {
-			message: 'No such user.',
-			code: 'NO_SUCH_USER',
-			id: '0b5cc374-3681-41da-861e-8bc1146f7a55'
-		},
-
-		isOwner: {
-			message: 'The user is the owner.',
-			code: 'IS_OWNER',
-			id: '1546eed5-4414-4dea-81c1-b0aec4f6d2af'
-		},
-	}
-};
-
-export default define(meta, async (ps, me) => {
-	// Fetch the group
-	const userGroup = await UserGroups.findOne({
-		id: ps.groupId,
-		userId: me.id,
-	});
-
-	if (userGroup == null) {
-		throw new ApiError(meta.errors.noSuchGroup);
-	}
-
-	// Fetch the user
-	const user = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
-		throw e;
-	});
-
-	if (user.id === userGroup.userId) {
-		throw new ApiError(meta.errors.isOwner);
-	}
-
-	// Pull the user
-	await UserGroupJoinings.delete({ userGroupId: userGroup.id, userId: user.id });
-});
diff --git a/src/server/api/endpoints/users/groups/show.ts b/src/server/api/endpoints/users/groups/show.ts
deleted file mode 100644
index 3c030bf3a5..0000000000
--- a/src/server/api/endpoints/users/groups/show.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import $ from 'cafy';
-import { ID } from '@/misc/cafy-id';
-import define from '../../../define';
-import { ApiError } from '../../../error';
-import { UserGroups, UserGroupJoinings } from '@/models/index';
-
-export const meta = {
-	tags: ['groups', 'account'],
-
-	requireCredential: true as const,
-
-	kind: 'read:user-groups',
-
-	params: {
-		groupId: {
-			validator: $.type(ID),
-		},
-	},
-
-	res: {
-		type: 'object' as const,
-		optional: false as const, nullable: false as const,
-		ref: 'UserGroup',
-	},
-
-	errors: {
-		noSuchGroup: {
-			message: 'No such group.',
-			code: 'NO_SUCH_GROUP',
-			id: 'ea04751e-9b7e-487b-a509-330fb6bd6b9b'
-		},
-	}
-};
-
-export default define(meta, async (ps, me) => {
-	// Fetch the group
-	const userGroup = await UserGroups.findOne({
-		id: ps.groupId,
-	});
-
-	if (userGroup == null) {
-		throw new ApiError(meta.errors.noSuchGroup);
-	}
-
-	const joining = await UserGroupJoinings.findOne({
-		userId: me.id,
-		userGroupId: userGroup.id
-	});
-
-	if (joining == null && userGroup.userId !== me.id) {
-		throw new ApiError(meta.errors.noSuchGroup);
-	}
-
-	return await UserGroups.pack(userGroup);
-});
diff --git a/src/server/api/endpoints/users/groups/transfer.ts b/src/server/api/endpoints/users/groups/transfer.ts
deleted file mode 100644
index 17c42e1127..0000000000
--- a/src/server/api/endpoints/users/groups/transfer.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import $ from 'cafy';
-import { ID } from '@/misc/cafy-id';
-import define from '../../../define';
-import { ApiError } from '../../../error';
-import { getUser } from '../../../common/getters';
-import { UserGroups, UserGroupJoinings } from '@/models/index';
-
-export const meta = {
-	tags: ['groups', 'users'],
-
-	requireCredential: true as const,
-
-	kind: 'write:user-groups',
-
-	params: {
-		groupId: {
-			validator: $.type(ID),
-		},
-
-		userId: {
-			validator: $.type(ID),
-		},
-	},
-
-	res: {
-		type: 'object' as const,
-		optional: false as const, nullable: false as const,
-		ref: 'UserGroup',
-	},
-
-	errors: {
-		noSuchGroup: {
-			message: 'No such group.',
-			code: 'NO_SUCH_GROUP',
-			id: '8e31d36b-2f88-4ccd-a438-e2d78a9162db'
-		},
-
-		noSuchUser: {
-			message: 'No such user.',
-			code: 'NO_SUCH_USER',
-			id: '711f7ebb-bbb9-4dfa-b540-b27809fed5e9'
-		},
-
-		noSuchGroupMember: {
-			message: 'No such group member.',
-			code: 'NO_SUCH_GROUP_MEMBER',
-			id: 'd31bebee-196d-42c2-9a3e-9474d4be6cc4'
-		},
-	}
-};
-
-export default define(meta, async (ps, me) => {
-	// Fetch the group
-	const userGroup = await UserGroups.findOne({
-		id: ps.groupId,
-		userId: me.id,
-	});
-
-	if (userGroup == null) {
-		throw new ApiError(meta.errors.noSuchGroup);
-	}
-
-	// Fetch the user
-	const user = await getUser(ps.userId).catch(e => {
-		if (e.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
-		throw e;
-	});
-
-	const joining = await UserGroupJoinings.findOne({
-		userGroupId: userGroup.id,
-		userId: user.id
-	});
-
-	if (joining == null) {
-		throw new ApiError(meta.errors.noSuchGroupMember);
-	}
-
-	await UserGroups.update(userGroup.id, {
-		userId: ps.userId
-	});
-
-	return await UserGroups.pack(userGroup.id);
-});
diff --git a/src/server/api/endpoints/users/groups/update.ts b/src/server/api/endpoints/users/groups/update.ts
deleted file mode 100644
index 127bbc47a1..0000000000
--- a/src/server/api/endpoints/users/groups/update.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import $ from 'cafy';
-import { ID } from '@/misc/cafy-id';
-import define from '../../../define';
-import { ApiError } from '../../../error';
-import { UserGroups } from '@/models/index';
-
-export const meta = {
-	tags: ['groups'],
-
-	requireCredential: true as const,
-
-	kind: 'write:user-groups',
-
-	params: {
-		groupId: {
-			validator: $.type(ID),
-		},
-
-		name: {
-			validator: $.str.range(1, 100),
-		}
-	},
-
-	res: {
-		type: 'object' as const,
-		optional: false as const, nullable: false as const,
-		ref: 'UserGroup',
-	},
-
-	errors: {
-		noSuchGroup: {
-			message: 'No such group.',
-			code: 'NO_SUCH_GROUP',
-			id: '9081cda3-7a9e-4fac-a6ce-908d70f282f6'
-		},
-	}
-};
-
-export default define(meta, async (ps, me) => {
-	// Fetch the group
-	const userGroup = await UserGroups.findOne({
-		id: ps.groupId,
-		userId: me.id
-	});
-
-	if (userGroup == null) {
-		throw new ApiError(meta.errors.noSuchGroup);
-	}
-
-	await UserGroups.update(userGroup.id, {
-		name: ps.name
-	});
-
-	return await UserGroups.pack(userGroup.id);
-});