4 files changed, 9 insertions, 8 deletions
diff --git a/src/server/api/endpoints/users/groups/create.ts b/src/server/api/endpoints/users/groups/create.ts
index 2c397b9cd1..0966ef7819 100644
--- a/src/server/api/endpoints/users/groups/create.ts
+++ b/src/server/api/endpoints/users/groups/create.ts
@@ -31,12 +31,12 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const userGroup = await UserGroups.save({
+	const userGroup = await UserGroups.insert({
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
 		name: ps.name,
-	} as UserGroup);
+	} as UserGroup).then(x => UserGroups.findOneOrFail(x.identifiers[0]));
 
 	// Push the owner
 	await UserGroupJoinings.insert({
diff --git a/src/server/api/endpoints/users/groups/invite.ts b/src/server/api/endpoints/users/groups/invite.ts
index 8b5ee12242..00d4932f55 100644
--- a/src/server/api/endpoints/users/groups/invite.ts
+++ b/src/server/api/endpoints/users/groups/invite.ts
@@ -96,12 +96,12 @@ export default define(meta, async (ps, me) => {
 		throw new ApiError(meta.errors.alreadyInvited);
 	}
 
-	const invitation = await UserGroupInvitations.save({
+	const invitation = await UserGroupInvitations.insert({
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
 		userGroupId: userGroup.id
-	} as UserGroupInvitation);
+	} as UserGroupInvitation).then(x => UserGroupInvitations.findOneOrFail(x.identifiers[0]));
 
 	// 通知を作成
 	createNotification(user.id, 'groupInvited', {
diff --git a/src/server/api/endpoints/users/lists/create.ts b/src/server/api/endpoints/users/lists/create.ts
index b1714fc321..9891a6dae0 100644
--- a/src/server/api/endpoints/users/lists/create.ts
+++ b/src/server/api/endpoints/users/lists/create.ts
@@ -30,12 +30,12 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const userList = await UserLists.save({
+	const userList = await UserLists.insert({
 		id: genId(),
 		createdAt: new Date(),
 		userId: user.id,
 		name: ps.name,
-	} as UserList);
+	} as UserList).then(x => UserLists.findOneOrFail(x.identifiers[0]));
 
 	return await UserLists.pack(userList);
 });
diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index 21a0cb747b..11d36d2ae9 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -6,6 +6,7 @@ import { ApiError } from '../../error';
 import { ID } from '@/misc/cafy-id';
 import { Users } from '../../../../models';
 import { In } from 'typeorm';
+import { User } from '@/models/entities/user';
 
 export const meta = {
 	desc: {
@@ -81,9 +82,9 @@ export default define(meta, async (ps, me) => {
 		});
 
 		// リクエストされた通りに並べ替え
-		const _users = [];
+		const _users: User[] = [];
 		for (const id of ps.userIds) {
-			_users.push(users.find(x => x.id === id));
+			_users.push(users.find(x => x.id === id)!);
 		}
 
 		return await Promise.all(_users.map(u => Users.pack(u, me, {