Merge branch 'develop'

28 files changed, 218 insertions, 583 deletions

diff --git a/src/server/api/endpoints/i/2fa/done.ts b/src/server/api/endpoints/i/2fa/done.ts
index 556354c386..e23678dcbb 100644
--- a/src/server/api/endpoints/i/2fa/done.ts
+++ b/src/server/api/endpoints/i/2fa/done.ts
@@ -1,7 +1,8 @@
 import $ from 'cafy';
 import * as speakeasy from 'speakeasy';
-import User from '../../../../../models/user';
 import define from '../../../define';
+import { UserProfiles } from '../../../../../models';
+import { ensure } from '../../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -16,28 +17,26 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const _token = ps.token.replace(/\s/g, '');
+	const token = ps.token.replace(/\s/g, '');
 
-	if (user.twoFactorTempSecret == null) {
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
+
+	if (profile.twoFactorTempSecret == null) {
 		throw new Error('二段階認証の設定が開始されていません');
 	}
 
 	const verified = (speakeasy as any).totp.verify({
-		secret: user.twoFactorTempSecret,
+		secret: profile.twoFactorTempSecret,
 		encoding: 'base32',
-		token: _token
+		token: token
 	});
 
 	if (!verified) {
 		throw new Error('not verified');
 	}
 
-	await User.update(user._id, {
-		$set: {
-			'twoFactorSecret': user.twoFactorTempSecret,
-			'twoFactorEnabled': true
-		}
+	await UserProfiles.update({ userId: user.id }, {
+		twoFactorSecret: profile.twoFactorTempSecret,
+		twoFactorEnabled: true
 	});
-
-	return;
 });
diff --git a/src/server/api/endpoints/i/2fa/register.ts b/src/server/api/endpoints/i/2fa/register.ts
index 302b51ec0b..76d79b3a49 100644
--- a/src/server/api/endpoints/i/2fa/register.ts
+++ b/src/server/api/endpoints/i/2fa/register.ts
@@ -2,9 +2,10 @@ import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
 import * as speakeasy from 'speakeasy';
 import * as QRCode from 'qrcode';
-import User from '../../../../../models/user';
 import config from '../../../../../config';
 import define from '../../../define';
+import { UserProfiles } from '../../../../../models';
+import { ensure } from '../../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -19,8 +20,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');
@@ -31,10 +34,8 @@ export default define(meta, async (ps, user) => {
 		length: 32
 	});
 
-	await User.update(user._id, {
-		$set: {
-			twoFactorTempSecret: secret.base32
-		}
+	await UserProfiles.update({ userId: user.id }, {
+		twoFactorTempSecret: secret.base32
 	});
 
 	// Get the data URL of the authenticator URL
diff --git a/src/server/api/endpoints/i/2fa/unregister.ts b/src/server/api/endpoints/i/2fa/unregister.ts
index 37b2639198..9c7857e7ef 100644
--- a/src/server/api/endpoints/i/2fa/unregister.ts
+++ b/src/server/api/endpoints/i/2fa/unregister.ts
@@ -1,7 +1,8 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User from '../../../../../models/user';
 import define from '../../../define';
+import { UserProfiles } from '../../../../../models';
+import { ensure } from '../../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -16,19 +17,17 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');
 	}
 
-	await User.update(user._id, {
-		$set: {
-			'twoFactorSecret': null,
-			'twoFactorEnabled': false
-		}
+	await UserProfiles.update({ userId: user.id }, {
+		twoFactorSecret: null,
+		twoFactorEnabled: false
 	});
-
-	return;
 });
diff --git a/src/server/api/endpoints/i/authorized-apps.ts b/src/server/api/endpoints/i/authorized-apps.ts
index cb8be9ed97..3e9fea19e2 100644
--- a/src/server/api/endpoints/i/authorized-apps.ts
+++ b/src/server/api/endpoints/i/authorized-apps.ts
@@ -1,7 +1,6 @@
 import $ from 'cafy';
-import AccessToken from '../../../../models/access-token';
-import { pack } from '../../../../models/app';
 import define from '../../define';
+import { AccessTokens, Apps } from '../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -28,18 +27,18 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	// Get tokens
-	const tokens = await AccessToken
-		.find({
-			userId: user._id
-		}, {
-			limit: ps.limit,
-			skip: ps.offset,
-			sort: {
-				_id: ps.sort == 'asc' ? 1 : -1
-			}
-		});
+	const tokens = await AccessTokens.find({
+		where: {
+			userId: user.id
+		},
+		take: ps.limit!,
+		skip: ps.offset,
+		order: {
+			id: ps.sort == 'asc' ? 1 : -1
+		}
+	});
 
-	return await Promise.all(tokens.map(token => pack(token.appId, user, {
+	return await Promise.all(tokens.map(token => Apps.pack(token.appId, user, {
 		detail: true
 	})));
 });
diff --git a/src/server/api/endpoints/i/change-password.ts b/src/server/api/endpoints/i/change-password.ts
index 8ab286b4bf..0dda125b9c 100644
--- a/src/server/api/endpoints/i/change-password.ts
+++ b/src/server/api/endpoints/i/change-password.ts
@@ -1,7 +1,8 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User from '../../../../models/user';
 import define from '../../define';
+import { UserProfiles } from '../../../../models';
+import { ensure } from '../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -20,8 +21,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
+
 	// Compare password
-	const same = await bcrypt.compare(ps.currentPassword, user.password);
+	const same = await bcrypt.compare(ps.currentPassword, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');
@@ -31,11 +34,7 @@ export default define(meta, async (ps, user) => {
 	const salt = await bcrypt.genSalt(8);
 	const hash = await bcrypt.hash(ps.newPassword, salt);
 
-	await User.update(user._id, {
-		$set: {
-			'password': hash
-		}
+	await UserProfiles.update({ userId: user.id }, {
+		password: hash
 	});
-
-	return;
 });
diff --git a/src/server/api/endpoints/i/clear-follow-request-notification.ts b/src/server/api/endpoints/i/clear-follow-request-notification.ts
deleted file mode 100644
index 38c6ec1cef..0000000000
--- a/src/server/api/endpoints/i/clear-follow-request-notification.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import User from '../../../../models/user';
-import define from '../../define';
-
-export const meta = {
-	tags: ['account', 'following'],
-
-	requireCredential: true,
-
-	kind: 'account-write',
-
-	params: {
-	}
-};
-
-export default define(meta, async (ps, user) => {
-	await User.update({ _id: user._id }, {
-		$set: {
-			pendingReceivedFollowRequestsCount: 0
-		}
-	});
-
-	return;
-});
diff --git a/src/server/api/endpoints/i/delete-account.ts b/src/server/api/endpoints/i/delete-account.ts
index fed38eab5a..389d0b3212 100644
--- a/src/server/api/endpoints/i/delete-account.ts
+++ b/src/server/api/endpoints/i/delete-account.ts
@@ -1,10 +1,8 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User from '../../../../models/user';
 import define from '../../define';
-import { createDeleteNotesJob, createDeleteDriveFilesJob } from '../../../../queue';
-import Message from '../../../../models/messaging-message';
-import Signin from '../../../../models/signin';
+import { Users, UserProfiles } from '../../../../models';
+import { ensure } from '../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -19,34 +17,14 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');
 	}
 
-	await User.update({ _id: user._id }, {
-		$set: {
-			isDeleted: true,
-			name: null,
-			description: null,
-			pinnedNoteIds: [],
-			password: null,
-			email: null,
-			twitter: null,
-			github: null,
-			discord: null,
-			profile: {},
-			fields: [],
-			clientSettings: {},
-		}
-	});
-
-	Message.remove({ userId: user._id });
-	Signin.remove({ userId: user._id });
-	createDeleteNotesJob(user);
-	createDeleteDriveFilesJob(user);
-
-	return;
+	await Users.delete(user.id);
 });
diff --git a/src/server/api/endpoints/i/export-blocking.ts b/src/server/api/endpoints/i/export-blocking.ts
index 346b29c79d..14d49487e8 100644
--- a/src/server/api/endpoints/i/export-blocking.ts
+++ b/src/server/api/endpoints/i/export-blocking.ts
@@ -13,6 +13,4 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	createExportBlockingJob(user);
-
-	return;
 });
diff --git a/src/server/api/endpoints/i/export-following.ts b/src/server/api/endpoints/i/export-following.ts
index 5977b03105..50dd28837f 100644
--- a/src/server/api/endpoints/i/export-following.ts
+++ b/src/server/api/endpoints/i/export-following.ts
@@ -13,6 +13,4 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	createExportFollowingJob(user);
-
-	return;
 });
diff --git a/src/server/api/endpoints/i/export-mute.ts b/src/server/api/endpoints/i/export-mute.ts
index 22ceff3631..1eb51cd77e 100644
--- a/src/server/api/endpoints/i/export-mute.ts
+++ b/src/server/api/endpoints/i/export-mute.ts
@@ -13,6 +13,4 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	createExportMuteJob(user);
-
-	return;
 });
diff --git a/src/server/api/endpoints/i/export-notes.ts b/src/server/api/endpoints/i/export-notes.ts
index 2881aa2697..dd32c18d11 100644
--- a/src/server/api/endpoints/i/export-notes.ts
+++ b/src/server/api/endpoints/i/export-notes.ts
@@ -13,6 +13,4 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	createExportNotesJob(user);
-
-	return;
 });
diff --git a/src/server/api/endpoints/i/export-user-lists.ts b/src/server/api/endpoints/i/export-user-lists.ts
index 9d7424ad89..7650ca7210 100644
--- a/src/server/api/endpoints/i/export-user-lists.ts
+++ b/src/server/api/endpoints/i/export-user-lists.ts
@@ -13,6 +13,4 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	createExportUserListsJob(user);
-
-	return;
 });
diff --git a/src/server/api/endpoints/i/favorites.ts b/src/server/api/endpoints/i/favorites.ts
index 7ea6f7b966..2c25250bea 100644
--- a/src/server/api/endpoints/i/favorites.ts
+++ b/src/server/api/endpoints/i/favorites.ts
@@ -1,7 +1,8 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import Favorite, { packMany } from '../../../../models/favorite';
+import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
+import { NoteFavorites } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
 
 export const meta = {
 	desc: {
@@ -23,42 +24,22 @@ export const meta = {
 
 		sinceId: {
 			validator: $.optional.type(ID),
-			transform: transform,
 		},
 
 		untilId: {
 			validator: $.optional.type(ID),
-			transform: transform,
-		}
+		},
 	}
 };
 
 export default define(meta, async (ps, user) => {
-	const query = {
-		userId: user._id
-	} as any;
-
-	const sort = {
-		_id: -1
-	};
-
-	if (ps.sinceId) {
-		sort._id = 1;
-		query._id = {
-			$gt: ps.sinceId
-		};
-	} else if (ps.untilId) {
-		query._id = {
-			$lt: ps.untilId
-		};
-	}
+	const query = makePaginationQuery(NoteFavorites.createQueryBuilder('favorite'), ps.sinceId, ps.untilId)
+		.andWhere(`favorite.userId = :meId`, { meId: user.id })
+		.leftJoinAndSelect('favorite.note', 'note');
 
-	// Get favorites
-	const favorites = await Favorite
-		.find(query, {
-			limit: ps.limit,
-			sort: sort
-		});
+	const favorites = await query
+		.take(ps.limit!)
+		.getMany();
 
-	return await packMany(favorites, user);
+	return await NoteFavorites.packMany(favorites, user);
 });
diff --git a/src/server/api/endpoints/i/import-following.ts b/src/server/api/endpoints/i/import-following.ts
index f188291bc2..deafec18ec 100644
--- a/src/server/api/endpoints/i/import-following.ts
+++ b/src/server/api/endpoints/i/import-following.ts
@@ -1,10 +1,10 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
+import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
 import { createImportFollowingJob } from '../../../../queue';
 import ms = require('ms');
-import DriveFile from '../../../../models/drive-file';
 import { ApiError } from '../../error';
+import { DriveFiles } from '../../../../models';
 
 export const meta = {
 	secure: true,
@@ -17,7 +17,6 @@ export const meta = {
 	params: {
 		fileId: {
 			validator: $.type(ID),
-			transform: transform,
 		}
 	},
 
@@ -49,16 +48,12 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const file = await DriveFile.findOne({
-		_id: ps.fileId
-	});
+	const file = await DriveFiles.findOne(ps.fileId);
 
 	if (file == null) throw new ApiError(meta.errors.noSuchFile);
-	//if (!file.contentType.endsWith('/csv')) throw new ApiError(meta.errors.unexpectedFileType);
-	if (file.length > 50000) throw new ApiError(meta.errors.tooBigFile);
-	if (file.length === 0) throw new ApiError(meta.errors.emptyFile);
+	//if (!file.type.endsWith('/csv')) throw new ApiError(meta.errors.unexpectedFileType);
+	if (file.size > 50000) throw new ApiError(meta.errors.tooBigFile);
+	if (file.size === 0) throw new ApiError(meta.errors.emptyFile);
 
-	createImportFollowingJob(user, file._id);
-
-	return;
+	createImportFollowingJob(user, file.id);
 });
diff --git a/src/server/api/endpoints/i/import-user-lists.ts b/src/server/api/endpoints/i/import-user-lists.ts
index ed3085e5f8..b7d9d029b7 100644
--- a/src/server/api/endpoints/i/import-user-lists.ts
+++ b/src/server/api/endpoints/i/import-user-lists.ts
@@ -1,10 +1,10 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
+import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
 import { createImportUserListsJob } from '../../../../queue';
 import ms = require('ms');
-import DriveFile from '../../../../models/drive-file';
 import { ApiError } from '../../error';
+import { DriveFiles } from '../../../../models';
 
 export const meta = {
 	secure: true,
@@ -17,7 +17,6 @@ export const meta = {
 	params: {
 		fileId: {
 			validator: $.type(ID),
-			transform: transform,
 		}
 	},
 
@@ -49,16 +48,12 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const file = await DriveFile.findOne({
-		_id: ps.fileId
-	});
+	const file = await DriveFiles.findOne(ps.fileId);
 
 	if (file == null) throw new ApiError(meta.errors.noSuchFile);
-	//if (!file.contentType.endsWith('/csv')) throw new ApiError(meta.errors.unexpectedFileType);
-	if (file.length > 30000) throw new ApiError(meta.errors.tooBigFile);
-	if (file.length === 0) throw new ApiError(meta.errors.emptyFile);
+	//if (!file.type.endsWith('/csv')) throw new ApiError(meta.errors.unexpectedFileType);
+	if (file.size > 30000) throw new ApiError(meta.errors.tooBigFile);
+	if (file.size === 0) throw new ApiError(meta.errors.emptyFile);
 
-	createImportUserListsJob(user, file._id);
-
-	return;
+	createImportUserListsJob(user, file.id);
 });
diff --git a/src/server/api/endpoints/i/notifications.ts b/src/server/api/endpoints/i/notifications.ts
index d3e3064abd..56074c9d00 100644
--- a/src/server/api/endpoints/i/notifications.ts
+++ b/src/server/api/endpoints/i/notifications.ts
@@ -1,11 +1,9 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import Notification from '../../../../models/notification';
-import { packMany } from '../../../../models/notification';
-import { getFriendIds } from '../../common/get-friends';
-import read from '../../common/read-notification';
+import { ID } from '../../../../misc/cafy-id';
+import { readNotification } from '../../common/read-notification';
 import define from '../../define';
-import { getHideUserIds } from '../../common/get-hide-users';
+import { makePaginationQuery } from '../../common/make-pagination-query';
+import { Notifications, Followings, Mutings } from '../../../../models';
 
 export const meta = {
 	desc: {
@@ -17,7 +15,7 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'account-read',
+	kind: 'read:notifications',
 
 	params: {
 		limit: {
@@ -27,12 +25,10 @@ export const meta = {
 
 		sinceId: {
 			validator: $.optional.type(ID),
-			transform: transform,
 		},
 
 		untilId: {
 			validator: $.optional.type(ID),
-			transform: transform,
 		},
 
 		following: {
@@ -46,12 +42,12 @@ export const meta = {
 		},
 
 		includeTypes: {
-			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])),
+			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest'])),
 			default: [] as string[]
 		},
 
 		excludeTypes: {
-			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'poll_vote', 'receiveFollowRequest'])),
+			validator: $.optional.arr($.str.or(['follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest'])),
 			default: [] as string[]
 		}
 	},
@@ -65,63 +61,38 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const hideUserIds = await getHideUserIds(user);
+	const followingQuery = Followings.createQueryBuilder('following')
+		.select('following.followeeId')
+		.where('following.followerId = :followerId', { followerId: user.id });
 
-	const query = {
-		notifieeId: user._id,
-		$and: [{
-			notifierId: {
-				$nin: hideUserIds
-			}
-		}]
-	} as any;
+	const mutingQuery = Mutings.createQueryBuilder('muting')
+		.select('muting.muteeId')
+		.where('muting.muterId = :muterId', { muterId: user.id });
 
-	const sort = {
-		_id: -1
-	};
+	const query = makePaginationQuery(Notifications.createQueryBuilder('notification'), ps.sinceId, ps.untilId)
+		.andWhere(`notification.notifieeId = :meId`, { meId: user.id })
+		.leftJoinAndSelect('notification.notifier', 'notifier');
 
-	if (ps.following) {
-		// ID list of the user itself and other users who the user follows
-		const followingIds = await getFriendIds(user._id);
-
-		query.$and.push({
-			notifierId: {
-				$in: followingIds
-			}
-		});
-	}
+	query.andWhere(`notification.notifierId NOT IN (${ mutingQuery.getQuery() })`);
+	query.setParameters(mutingQuery.getParameters());
 
-	if (ps.sinceId) {
-		sort._id = 1;
-		query._id = {
-			$gt: ps.sinceId
-		};
-	} else if (ps.untilId) {
-		query._id = {
-			$lt: ps.untilId
-		};
+	if (ps.following) {
+		query.andWhere(`((notification.notifierId IN (${ followingQuery.getQuery() })) OR (notification.notifierId = :meId))`, { meId: user.id });
+		query.setParameters(followingQuery.getParameters());
 	}
 
-	if (ps.includeTypes.length > 0) {
-		query.type = {
-			$in: ps.includeTypes
-		};
-	} else if (ps.excludeTypes.length > 0) {
-		query.type = {
-			$nin: ps.excludeTypes
-		};
+	if (ps.includeTypes!.length > 0) {
+		query.andWhere(`notification.type IN (:...includeTypes)`, { includeTypes: ps.includeTypes });
+	} else if (ps.excludeTypes!.length > 0) {
+		query.andWhere(`notification.type NOT IN (:...excludeTypes)`, { excludeTypes: ps.excludeTypes });
 	}
 
-	const notifications = await Notification
-		.find(query, {
-			limit: ps.limit,
-			sort: sort
-		});
+	const notifications = await query.take(ps.limit!).getMany();
 
 	// Mark all as read
 	if (notifications.length > 0 && ps.markAsRead) {
-		read(user._id, notifications);
+		readNotification(user.id, notifications.map(x => x.id));
 	}
 
-	return await packMany(notifications);
+	return await Notifications.packMany(notifications);
 });
diff --git a/src/server/api/endpoints/i/pin.ts b/src/server/api/endpoints/i/pin.ts
index 8d853d45c8..ac104b19f9 100644
--- a/src/server/api/endpoints/i/pin.ts
+++ b/src/server/api/endpoints/i/pin.ts
@@ -1,9 +1,9 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import { pack } from '../../../../models/user';
+import { ID } from '../../../../misc/cafy-id';
 import { addPinned } from '../../../../services/i/pin';
 import define from '../../define';
 import { ApiError } from '../../error';
+import { Users } from '../../../../models';
 
 export const meta = {
 	stability: 'stable',
@@ -16,12 +16,11 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'account-write',
+	kind: 'write:account',
 
 	params: {
 		noteId: {
 			validator: $.type(ID),
-			transform: transform,
 			desc: {
 				'ja-JP': '対象の投稿のID',
 				'en-US': 'Target note ID'
@@ -58,7 +57,7 @@ export default define(meta, async (ps, user) => {
 		throw e;
 	});
 
-	return await pack(user, user, {
+	return await Users.pack(user, user, {
 		detail: true
 	});
 });
diff --git a/src/server/api/endpoints/i/read-all-messaging-messages.ts b/src/server/api/endpoints/i/read-all-messaging-messages.ts
index bbbfa0d7b3..e8ada277e9 100644
--- a/src/server/api/endpoints/i/read-all-messaging-messages.ts
+++ b/src/server/api/endpoints/i/read-all-messaging-messages.ts
@@ -1,7 +1,6 @@
-import User from '../../../../models/user';
 import { publishMainStream } from '../../../../services/stream';
-import Message from '../../../../models/messaging-message';
 import define from '../../define';
+import { MessagingMessages } from '../../../../models';
 
 export const meta = {
 	desc: {
@@ -13,7 +12,7 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'account-write',
+	kind: 'write:account',
 
 	params: {
 	}
@@ -21,24 +20,12 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	// Update documents
-	await Message.update({
-		recipientId: user._id,
+	await MessagingMessages.update({
+		recipientId: user.id,
 		isRead: false
 	}, {
-		$set: {
-			isRead: true
-		}
-	}, {
-		multi: true
-	});
-
-	User.update({ _id: user._id }, {
-		$set: {
-			hasUnreadMessagingMessage: false
-		}
+		isRead: true
 	});
 
-	publishMainStream(user._id, 'readAllMessagingMessages');
-
-	return;
+	publishMainStream(user.id, 'readAllMessagingMessages');
 });
diff --git a/src/server/api/endpoints/i/read-all-unread-notes.ts b/src/server/api/endpoints/i/read-all-unread-notes.ts
index 742c2d9908..cc8ebf58ec 100644
--- a/src/server/api/endpoints/i/read-all-unread-notes.ts
+++ b/src/server/api/endpoints/i/read-all-unread-notes.ts
@@ -1,7 +1,6 @@
-import User from '../../../../models/user';
 import { publishMainStream } from '../../../../services/stream';
-import NoteUnread from '../../../../models/note-unread';
 import define from '../../define';
+import { NoteUnreads } from '../../../../models';
 
 export const meta = {
 	desc: {
@@ -13,7 +12,7 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'account-write',
+	kind: 'write:account',
 
 	params: {
 	}
@@ -21,20 +20,11 @@ export const meta = {
 
 export default define(meta, async (ps, user) => {
 	// Remove documents
-	await NoteUnread.remove({
-		userId: user._id
-	});
-
-	User.update({ _id: user._id }, {
-		$set: {
-			hasUnreadMentions: false,
-			hasUnreadSpecifiedNotes: false
-		}
+	await NoteUnreads.delete({
+		userId: user.id
 	});
 
 	// 全て既読になったイベントを発行
-	publishMainStream(user._id, 'readAllUnreadMentions');
-	publishMainStream(user._id, 'readAllUnreadSpecifiedNotes');
-
-	return;
+	publishMainStream(user.id, 'readAllUnreadMentions');
+	publishMainStream(user.id, 'readAllUnreadSpecifiedNotes');
 });
diff --git a/src/server/api/endpoints/i/regenerate-token.ts b/src/server/api/endpoints/i/regenerate-token.ts
index ad10b99b36..56c0362c88 100644
--- a/src/server/api/endpoints/i/regenerate-token.ts
+++ b/src/server/api/endpoints/i/regenerate-token.ts
@@ -1,9 +1,10 @@
 import $ from 'cafy';
 import * as bcrypt from 'bcryptjs';
-import User from '../../../../models/user';
 import { publishMainStream } from '../../../../services/stream';
 import generateUserToken from '../../common/generate-native-user-token';
 import define from '../../define';
+import { Users, UserProfiles } from '../../../../models';
+import { ensure } from '../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -18,8 +19,10 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');
@@ -28,14 +31,10 @@ export default define(meta, async (ps, user) => {
 	// Generate secret
 	const secret = generateUserToken();
 
-	await User.update(user._id, {
-		$set: {
-			'token': secret
-		}
+	await Users.update(user.id, {
+		token: secret
 	});
 
 	// Publish event
-	publishMainStream(user._id, 'myTokenRegenerated');
-
-	return;
+	publishMainStream(user.id, 'myTokenRegenerated');
 });
diff --git a/src/server/api/endpoints/i/signin-history.ts b/src/server/api/endpoints/i/signin-history.ts
index 87160a9f91..74648951fd 100644
--- a/src/server/api/endpoints/i/signin-history.ts
+++ b/src/server/api/endpoints/i/signin-history.ts
@@ -1,7 +1,8 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import Signin, { pack } from '../../../../models/signin';
+import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
+import { Signins } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
 
 export const meta = {
 	requireCredential: true,
@@ -16,41 +17,19 @@ export const meta = {
 
 		sinceId: {
 			validator: $.optional.type(ID),
-			transform: transform,
 		},
 
 		untilId: {
 			validator: $.optional.type(ID),
-			transform: transform,
 		}
 	}
 };
 
 export default define(meta, async (ps, user) => {
-	const query = {
-		userId: user._id
-	} as any;
+	const query = makePaginationQuery(Signins.createQueryBuilder('signin'), ps.sinceId, ps.untilId)
+		.andWhere(`signin.userId = :meId`, { meId: user.id });
 
-	const sort = {
-		_id: -1
-	};
+	const history = await query.take(ps.limit!).getMany();
 
-	if (ps.sinceId) {
-		sort._id = 1;
-		query._id = {
-			$gt: ps.sinceId
-		};
-	} else if (ps.untilId) {
-		query._id = {
-			$lt: ps.untilId
-		};
-	}
-
-	const history = await Signin
-		.find(query, {
-			limit: ps.limit,
-			sort: sort
-		});
-
-	return await Promise.all(history.map(record => pack(record)));
+	return await Promise.all(history.map(record => Signins.pack(record)));
 });
diff --git a/src/server/api/endpoints/i/unpin.ts b/src/server/api/endpoints/i/unpin.ts
index 184d46f2c3..4688533578 100644
--- a/src/server/api/endpoints/i/unpin.ts
+++ b/src/server/api/endpoints/i/unpin.ts
@@ -1,9 +1,9 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import { pack } from '../../../../models/user';
+import { ID } from '../../../../misc/cafy-id';
 import { removePinned } from '../../../../services/i/pin';
 import define from '../../define';
 import { ApiError } from '../../error';
+import { Users } from '../../../../models';
 
 export const meta = {
 	stability: 'stable',
@@ -16,12 +16,11 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'account-write',
+	kind: 'write:account',
 
 	params: {
 		noteId: {
 			validator: $.type(ID),
-			transform: transform,
 			desc: {
 				'ja-JP': '対象の投稿のID',
 				'en-US': 'Target note ID'
@@ -44,7 +43,7 @@ export default define(meta, async (ps, user) => {
 		throw e;
 	});
 
-	return await pack(user, user, {
+	return await Users.pack(user, user, {
 		detail: true
 	});
 });
diff --git a/src/server/api/endpoints/i/update-client-setting.ts b/src/server/api/endpoints/i/update-client-setting.ts
index 79cd04e169..36de183379 100644
--- a/src/server/api/endpoints/i/update-client-setting.ts
+++ b/src/server/api/endpoints/i/update-client-setting.ts
@@ -1,7 +1,7 @@
 import $ from 'cafy';
-import User from '../../../../models/user';
 import { publishMainStream } from '../../../../services/stream';
 import define from '../../define';
+import { UserProfiles } from '../../../../models';
 
 export const meta = {
 	requireCredential: true,
@@ -10,7 +10,7 @@ export const meta = {
 
 	params: {
 		name: {
-			validator: $.str
+			validator: $.str.match(/^[a-zA-Z]+$/)
 		},
 
 		value: {
@@ -20,18 +20,18 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
-	const x: any = {};
-	x[`clientSettings.${ps.name}`] = ps.value;
-
-	await User.update(user._id, {
-		$set: x
-	});
+	await UserProfiles.createQueryBuilder().update()
+		.set({
+			clientData: {
+				[ps.name]: ps.value
+			},
+		})
+		.where('userId = :id', { id: user.id })
+		.execute();
 
 	// Publish event
-	publishMainStream(user._id, 'clientSettingUpdated', {
+	publishMainStream(user.id, 'clientSettingUpdated', {
 		key: ps.name,
 		value: ps.value
 	});
-
-	return;
 });
diff --git a/src/server/api/endpoints/i/update-email.ts b/src/server/api/endpoints/i/update-email.ts
index c90462d850..15c62a9d08 100644
--- a/src/server/api/endpoints/i/update-email.ts
+++ b/src/server/api/endpoints/i/update-email.ts
@@ -1,5 +1,4 @@
 import $ from 'cafy';
-import User, { pack } from '../../../../models/user';
 import { publishMainStream } from '../../../../services/stream';
 import define from '../../define';
 import * as nodemailer from 'nodemailer';
@@ -9,6 +8,8 @@ import config from '../../../../config';
 import * as ms from 'ms';
 import * as bcrypt from 'bcryptjs';
 import { apiLogger } from '../../logger';
+import { Users, UserProfiles } from '../../../../models';
+import { ensure } from '../../../../prelude/ensure';
 
 export const meta = {
 	requireCredential: true,
@@ -32,36 +33,34 @@ export const meta = {
 };
 
 export default define(meta, async (ps, user) => {
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
+
 	// Compare password
-	const same = await bcrypt.compare(ps.password, user.password);
+	const same = await bcrypt.compare(ps.password, profile.password!);
 
 	if (!same) {
 		throw new Error('incorrect password');
 	}
 
-	await User.update(user._id, {
-		$set: {
-			email: ps.email,
-			emailVerified: false,
-			emailVerifyCode: null
-		}
+	await UserProfiles.update({ userId: user.id }, {
+		email: ps.email,
+		emailVerified: false,
+		emailVerifyCode: null
 	});
 
-	const iObj = await pack(user._id, user, {
+	const iObj = await Users.pack(user.id, user, {
 		detail: true,
 		includeSecrets: true
 	});
 
 	// Publish meUpdated event
-	publishMainStream(user._id, 'meUpdated', iObj);
+	publishMainStream(user.id, 'meUpdated', iObj);
 
 	if (ps.email != null) {
 		const code = rndstr('a-z0-9', 16);
 
-		await User.update(user._id, {
-			$set: {
-				emailVerifyCode: code
-			}
+		await UserProfiles.update({ userId: user.id }, {
+			emailVerifyCode: code
 		});
 
 		const meta = await fetchMeta();
@@ -77,14 +76,14 @@ export default define(meta, async (ps, user) => {
 				user: meta.smtpUser,
 				pass: meta.smtpPass
 			} : undefined
-		});
+		} as any);
 
 		const link = `${config.url}/verify-email/${code}`;
 
 		transporter.sendMail({
-			from: meta.email,
+			from: meta.email!,
 			to: ps.email,
-			subject: meta.name,
+			subject: meta.name || 'Misskey',
 			text: `To verify email, please click this link: ${link}`
 		}, (error, info) => {
 			if (error) {
diff --git a/src/server/api/endpoints/i/update-home.ts b/src/server/api/endpoints/i/update-home.ts
deleted file mode 100644
index e2c319887f..0000000000
--- a/src/server/api/endpoints/i/update-home.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import $ from 'cafy';
-import User from '../../../../models/user';
-import { publishMainStream } from '../../../../services/stream';
-import define from '../../define';
-
-export const meta = {
-	requireCredential: true,
-
-	secure: true,
-
-	params: {
-		home: {
-			validator: $.arr($.obj({
-				name: $.str,
-				id: $.str,
-				place: $.str,
-				data: $.obj()
-			}).strict())
-		}
-	}
-};
-
-export default define(meta, async (ps, user) => {
-	await User.update(user._id, {
-		$set: {
-			'clientSettings.home': ps.home
-		}
-	});
-
-	publishMainStream(user._id, 'homeUpdated', ps.home);
-
-	return;
-});
diff --git a/src/server/api/endpoints/i/update-mobile-home.ts b/src/server/api/endpoints/i/update-mobile-home.ts
deleted file mode 100644
index 642e2b3e09..0000000000
--- a/src/server/api/endpoints/i/update-mobile-home.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import $ from 'cafy';
-import User from '../../../../models/user';
-import { publishMainStream } from '../../../../services/stream';
-import define from '../../define';
-
-export const meta = {
-	requireCredential: true,
-
-	secure: true,
-
-	params: {
-		home: {
-			validator: $.arr($.obj({
-				name: $.str,
-				id: $.str,
-				data: $.obj()
-			}).strict())
-		}
-	}
-};
-
-export default define(meta, async (ps, user) => {
-	await User.update(user._id, {
-		$set: {
-			'clientSettings.mobileHome': ps.home
-		}
-	});
-
-	publishMainStream(user._id, 'mobileHomeUpdated', ps.home);
-
-	return;
-});
diff --git a/src/server/api/endpoints/i/update-widget.ts b/src/server/api/endpoints/i/update-widget.ts
deleted file mode 100644
index 67d342278d..0000000000
--- a/src/server/api/endpoints/i/update-widget.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import $ from 'cafy';
-import User from '../../../../models/user';
-import { publishMainStream } from '../../../../services/stream';
-import define from '../../define';
-
-export const meta = {
-	requireCredential: true,
-
-	secure: true,
-
-	params: {
-		id: {
-			validator: $.str
-		},
-
-		data: {
-			validator: $.obj()
-		}
-	}
-};
-
-export default define(meta, async (ps, user) => {
-	if (ps.id == null && ps.data == null) throw new Error('you need to set id and data params if home param unset');
-
-	let widget;
-
-	//#region Desktop home
-	if (widget == null && user.clientSettings.home) {
-		const desktopHome = user.clientSettings.home;
-		widget = desktopHome.find((w: any) => w.id == ps.id);
-		if (widget) {
-				widget.data = ps.data;
-
-			await User.update(user._id, {
-				$set: {
-					'clientSettings.home': desktopHome
-				}
-			});
-		}
-	}
-	//#endregion
-
-	//#region Mobile home
-	if (widget == null && user.clientSettings.mobileHome) {
-		const mobileHome = user.clientSettings.mobileHome;
-		widget = mobileHome.find((w: any) => w.id == ps.id);
-		if (widget) {
-				widget.data = ps.data;
-
-			await User.update(user._id, {
-				$set: {
-					'clientSettings.mobileHome': mobileHome
-				}
-			});
-		}
-	}
-	//#endregion
-
-	//#region Deck
-	if (widget == null && user.clientSettings.deck && user.clientSettings.deck.columns) {
-		const deck = user.clientSettings.deck;
-		for (const c of deck.columns.filter((c: any) => c.type == 'widgets')) {
-			for (const w of c.widgets.filter((w: any) => w.id == ps.id)) {
-				widget = w;
-			}
-		}
-		if (widget) {
-				widget.data = ps.data;
-
-			await User.update(user._id, {
-				$set: {
-					'clientSettings.deck': deck
-				}
-			});
-		}
-	}
-	//#endregion
-
-	if (widget) {
-		publishMainStream(user._id, 'widgetUpdated', {
-			id: ps.id, data: ps.data
-		});
-
-		return;
-	} else {
-		throw new Error('widget not found');
-	}
-});
diff --git a/src/server/api/endpoints/i/update.ts b/src/server/api/endpoints/i/update.ts
index 099ef33990..d06ab621c6 100644
--- a/src/server/api/endpoints/i/update.ts
+++ b/src/server/api/endpoints/i/update.ts
@@ -1,18 +1,18 @@
 import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
+import { ID } from '../../../../misc/cafy-id';
 import { publishMainStream } from '../../../../services/stream';
-import DriveFile from '../../../../models/drive-file';
 import acceptAllFollowRequests from '../../../../services/following/requests/accept-all';
 import { publishToFollowers } from '../../../../services/i/update';
 import define from '../../define';
-import getDriveFileUrl from '../../../../misc/get-drive-file-url';
 import { parse, parsePlain } from '../../../../mfm/parse';
 import extractEmojis from '../../../../misc/extract-emojis';
 import extractHashtags from '../../../../misc/extract-hashtags';
 import * as langmap from 'langmap';
 import { updateHashtag } from '../../../../services/update-hashtag';
 import { ApiError } from '../../error';
+import { Users, DriveFiles, UserProfiles } from '../../../../models';
+import { User } from '../../../../models/entities/user';
+import { UserProfile } from '../../../../models/entities/user-profile';
 
 export const meta = {
 	desc: {
@@ -24,18 +24,18 @@ export const meta = {
 
 	requireCredential: true,
 
-	kind: 'account-write',
+	kind: 'write:account',
 
 	params: {
 		name: {
-			validator: $.optional.nullable.str.pipe(isValidName),
+			validator: $.optional.nullable.str.pipe(Users.isValidName),
 			desc: {
 				'ja-JP': '名前(ハンドルネームやニックネーム)'
 			}
 		},
 
 		description: {
-			validator: $.optional.nullable.str.pipe(isValidDescription),
+			validator: $.optional.nullable.str.pipe(Users.isValidDescription),
 			desc: {
 				'ja-JP': 'アカウントの説明や自己紹介'
 			}
@@ -49,14 +49,14 @@ export const meta = {
 		},
 
 		location: {
-			validator: $.optional.nullable.str.pipe(isValidLocation),
+			validator: $.optional.nullable.str.pipe(Users.isValidLocation),
 			desc: {
 				'ja-JP': '住んでいる地域、所在'
 			}
 		},
 
 		birthday: {
-			validator: $.optional.nullable.str.pipe(isValidBirthday),
+			validator: $.optional.nullable.str.pipe(Users.isValidBirthday),
 			desc: {
 				'ja-JP': '誕生日 (YYYY-MM-DD形式)'
 			}
@@ -64,7 +64,6 @@ export const meta = {
 
 		avatarId: {
 			validator: $.optional.nullable.type(ID),
-			transform: transform,
 			desc: {
 				'ja-JP': 'アイコンに設定する画像のドライブファイルID'
 			}
@@ -72,20 +71,11 @@ export const meta = {
 
 		bannerId: {
 			validator: $.optional.nullable.type(ID),
-			transform: transform,
 			desc: {
 				'ja-JP': 'バナーに設定する画像のドライブファイルID'
 			}
 		},
 
-		wallpaperId: {
-			validator: $.optional.nullable.type(ID),
-			transform: transform,
-			desc: {
-				'ja-JP': '壁紙に設定する画像のドライブファイルID'
-			}
-		},
-
 		isLocked: {
 			validator: $.optional.bool,
 			desc: {
@@ -166,121 +156,83 @@ export const meta = {
 export default define(meta, async (ps, user, app) => {
 	const isSecure = user != null && app == null;
 
-	const updates = {} as any;
+	const updates = {} as Partial<User>;
+	const profile = {} as Partial<UserProfile>;
 
 	if (ps.name !== undefined) updates.name = ps.name;
-	if (ps.description !== undefined) updates.description = ps.description;
-	if (ps.lang !== undefined) updates.lang = ps.lang;
-	if (ps.location !== undefined) updates['profile.location'] = ps.location;
-	if (ps.birthday !== undefined) updates['profile.birthday'] = ps.birthday;
+	if (ps.description !== undefined) profile.description = ps.description;
+	//if (ps.lang !== undefined) updates.lang = ps.lang;
+	if (ps.location !== undefined) profile.location = ps.location;
+	if (ps.birthday !== undefined) profile.birthday = ps.birthday;
 	if (ps.avatarId !== undefined) updates.avatarId = ps.avatarId;
 	if (ps.bannerId !== undefined) updates.bannerId = ps.bannerId;
-	if (ps.wallpaperId !== undefined) updates.wallpaperId = ps.wallpaperId;
 	if (typeof ps.isLocked == 'boolean') updates.isLocked = ps.isLocked;
 	if (typeof ps.isBot == 'boolean') updates.isBot = ps.isBot;
-	if (typeof ps.carefulBot == 'boolean') updates.carefulBot = ps.carefulBot;
-	if (typeof ps.autoAcceptFollowed == 'boolean') updates.autoAcceptFollowed = ps.autoAcceptFollowed;
+	if (typeof ps.carefulBot == 'boolean') profile.carefulBot = ps.carefulBot;
+	if (typeof ps.autoAcceptFollowed == 'boolean') profile.autoAcceptFollowed = ps.autoAcceptFollowed;
 	if (typeof ps.isCat == 'boolean') updates.isCat = ps.isCat;
-	if (typeof ps.autoWatch == 'boolean') updates['settings.autoWatch'] = ps.autoWatch;
-	if (typeof ps.alwaysMarkNsfw == 'boolean') updates['settings.alwaysMarkNsfw'] = ps.alwaysMarkNsfw;
+	if (typeof ps.autoWatch == 'boolean') profile.autoWatch = ps.autoWatch;
+	if (typeof ps.alwaysMarkNsfw == 'boolean') profile.alwaysMarkNsfw = ps.alwaysMarkNsfw;
 
 	if (ps.avatarId) {
-		const avatar = await DriveFile.findOne({
-			_id: ps.avatarId
-		});
+		const avatar = await DriveFiles.findOne(ps.avatarId);
 
-		if (avatar == null) throw new ApiError(meta.errors.noSuchAvatar);
-		if (!avatar.contentType.startsWith('image/')) throw new ApiError(meta.errors.avatarNotAnImage);
+		if (avatar == null || avatar.userId !== user.id) throw new ApiError(meta.errors.noSuchAvatar);
+		if (!avatar.type.startsWith('image/')) throw new ApiError(meta.errors.avatarNotAnImage);
 
-		if (avatar.metadata.deletedAt) {
-			updates.avatarUrl = null;
-		} else {
-			updates.avatarUrl = getDriveFileUrl(avatar, true);
+		updates.avatarUrl = DriveFiles.getPublicUrl(avatar, true);
 
-			if (avatar.metadata.properties.avgColor) {
-				updates.avatarColor = avatar.metadata.properties.avgColor;
-			}
+		if (avatar.properties.avgColor) {
+			updates.avatarColor = avatar.properties.avgColor;
 		}
 	}
 
 	if (ps.bannerId) {
-		const banner = await DriveFile.findOne({
-			_id: ps.bannerId
-		});
-
-		if (banner == null) throw new ApiError(meta.errors.noSuchBanner);
-		if (!banner.contentType.startsWith('image/')) throw new ApiError(meta.errors.bannerNotAnImage);
-
-		if (banner.metadata.deletedAt) {
-			updates.bannerUrl = null;
-		} else {
-			updates.bannerUrl = getDriveFileUrl(banner, false);
-
-			if (banner.metadata.properties.avgColor) {
-				updates.bannerColor = banner.metadata.properties.avgColor;
-			}
-		}
-	}
-
-	if (ps.wallpaperId !== undefined) {
-		if (ps.wallpaperId === null) {
-			updates.wallpaperUrl = null;
-			updates.wallpaperColor = null;
-		} else {
-			const wallpaper = await DriveFile.findOne({
-				_id: ps.wallpaperId
-			});
+		const banner = await DriveFiles.findOne(ps.bannerId);
 
-			if (wallpaper == null) throw new Error('wallpaper not found');
+		if (banner == null || banner.userId !== user.id) throw new ApiError(meta.errors.noSuchBanner);
+		if (!banner.type.startsWith('image/')) throw new ApiError(meta.errors.bannerNotAnImage);
 
-			if (wallpaper.metadata.deletedAt) {
-				updates.wallpaperUrl = null;
-			} else {
-				updates.wallpaperUrl = getDriveFileUrl(wallpaper);
+		updates.bannerUrl = DriveFiles.getPublicUrl(banner, false);
 
-				if (wallpaper.metadata.properties.avgColor) {
-					updates.wallpaperColor = wallpaper.metadata.properties.avgColor;
-				}
-			}
+		if (banner.properties.avgColor) {
+			updates.bannerColor = banner.properties.avgColor;
 		}
 	}
 
 	//#region emojis/tags
-	if (updates.name != null || updates.description != null) {
-		let emojis = [] as string[];
-		let tags = [] as string[];
+	let emojis = [] as string[];
+	let tags = [] as string[];
 
-		if (updates.name != null) {
-			const tokens = parsePlain(updates.name);
-			emojis = emojis.concat(extractEmojis(tokens));
-		}
+	if (updates.name != null) {
+		const tokens = parsePlain(updates.name);
+		emojis = emojis.concat(extractEmojis(tokens!));
+	}
 
-		if (updates.description != null) {
-			const tokens = parse(updates.description);
-			emojis = emojis.concat(extractEmojis(tokens));
-			tags = extractHashtags(tokens).map(tag => tag.toLowerCase());
-		}
+	if (profile.description != null) {
+		const tokens = parse(profile.description);
+		emojis = emojis.concat(extractEmojis(tokens!));
+		tags = extractHashtags(tokens!).map(tag => tag.toLowerCase());
+	}
 
-		updates.emojis = emojis;
-		updates.tags = tags;
+	updates.emojis = emojis;
+	updates.tags = tags;
 
-		// ハッシュタグ更新
-		for (const tag of tags) updateHashtag(user, tag, true, true);
-		for (const tag of (user.tags || []).filter(x => !tags.includes(x))) updateHashtag(user, tag, true, false);
-	}
+	// ハッシュタグ更新
+	for (const tag of tags) updateHashtag(user, tag, true, true);
+	for (const tag of user.tags.filter(x => !tags.includes(x))) updateHashtag(user, tag, true, false);
 	//#endregion
 
-	await User.update(user._id, {
-		$set: updates
-	});
+	if (Object.keys(updates).length > 0) await Users.update(user.id, updates);
+	if (Object.keys(profile).length > 0) await UserProfiles.update({ userId: user.id }, profile);
 
-	const iObj = await pack(user._id, user, {
+	const iObj = await Users.pack(user.id, user, {
 		detail: true,
 		includeSecrets: isSecure
 	});
 
 	// Publish meUpdated event
-	publishMainStream(user._id, 'meUpdated', iObj);
+	publishMainStream(user.id, 'meUpdated', iObj);
 
 	// 鍵垢を解除したとき、溜まっていたフォローリクエストがあるならすべて承認
 	if (user.isLocked && ps.isLocked === false) {
@@ -288,7 +240,7 @@ export default define(meta, async (ps, user, app) => {
 	}
 
 	// フォロワーにUpdateを配信
-	publishToFollowers(user._id);
+	publishToFollowers(user.id);
 
 	return iObj;
 });