Merge remote-tracking branch 'refs/remotes/origin/master' into domain

src/api/models/user.ts

@@ -58,6 +58,7 @@ export type IUser = {
 	pinned_post_id: mongo.ObjectID;
 	is_suspended: boolean;
 	keywords: string[];
+	host: string;
 	account: {
 		keypair: string;
 		email: string;

src/api/private/signup.ts

@@ -119,6 +119,7 @@ export default async (req: express.Request, res: express.Response) => {
 		drive_capacity: 1073741824, // 1GB
 		username: username,
 		username_lower: username.toLowerCase(),
+		host: null,
 		account: {
 			keypair: generateKeypair(),
 			token: secret,

tools/migration/node.1522066477.user-account-keypair.js

@@ -6,9 +6,7 @@ const updates = [];
 User.find({}).each(function(user) {
 	updates.push(User.update({ _id: user._id }, {
 		$set: {
-			account: {
+			'account.keypair': generate(),
-				keypair: generate(),
-			}
 		}
 	}));
 }).then(function () {

tools/migration/shell.1522116709.user-host.js

@@ -0,0 +1 @@
+db.users.update({ }, { $set: { host: null } }, { multi: true });