summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-27 12:23:51 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-27 12:23:51 +0900
commitaffaf07d3fb90dbe4b6fbfa1aa8c17f3cb8c4f46 (patch)
tree59fc32601e2a768f4cbda87b7068c5f10010ac65 /src
parentMerge branch 'master' of https://github.com/syuilo/misskey (diff)
parentMerge pull request #1311 from akihikodaki/key (diff)
downloadsharkey-affaf07d3fb90dbe4b6fbfa1aa8c17f3cb8c4f46.tar.gz
sharkey-affaf07d3fb90dbe4b6fbfa1aa8c17f3cb8c4f46.tar.bz2
sharkey-affaf07d3fb90dbe4b6fbfa1aa8c17f3cb8c4f46.zip
Merge remote-tracking branch 'refs/remotes/origin/master' into domain
Diffstat (limited to 'src')
-rw-r--r--src/api/models/user.ts1
-rw-r--r--src/api/private/signup.ts1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/api/models/user.ts b/src/api/models/user.ts
index d3875a65b9..08d7fbb8c7 100644
--- a/src/api/models/user.ts
+++ b/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;
diff --git a/src/api/private/signup.ts b/src/api/private/signup.ts
index 690f3001cc..a4c06b5f5e 100644
--- a/src/api/private/signup.ts
+++ b/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,