summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-14 14:39:07 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-14 14:39:07 +0900
commitd81c20f163f0884d04cd11e46221bfefc0ac9f22 (patch)
tree68a7b4120540f580975eb21978b19d5375fd61b3 /src/server/api
parentBetter indexes (diff)
downloadsharkey-d81c20f163f0884d04cd11e46221bfefc0ac9f22.tar.gz
sharkey-d81c20f163f0884d04cd11e46221bfefc0ac9f22.tar.bz2
sharkey-d81c20f163f0884d04cd11e46221bfefc0ac9f22.zip
hostLowerは廃止してhostにlowerしたものを入れるように
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/common/get-host-lower.ts2
-rw-r--r--src/server/api/endpoints/users/notes.ts2
-rw-r--r--src/server/api/private/signup.ts1
3 files changed, 2 insertions, 3 deletions
diff --git a/src/server/api/common/get-host-lower.ts b/src/server/api/common/get-host-lower.ts
index fc4b30439e..550c233001 100644
--- a/src/server/api/common/get-host-lower.ts
+++ b/src/server/api/common/get-host-lower.ts
@@ -1,5 +1,5 @@
import { toUnicode } from 'punycode';
export default host => {
- return toUnicode(host).replace(/[A-Z]+/, match => match.toLowerCase());
+ return toUnicode(host).toLowerCase();
};
diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts
index e91b75e1d3..bd4247c79c 100644
--- a/src/server/api/endpoints/users/notes.ts
+++ b/src/server/api/endpoints/users/notes.ts
@@ -65,7 +65,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
const q = userId !== undefined
? { _id: userId }
- : { usernameLower: username.toLowerCase(), hostLower: getHostLower(host) } ;
+ : { usernameLower: username.toLowerCase(), host: getHostLower(host) } ;
// Lookup user
const user = await User.findOne(q, {
diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts
index 15257b869f..cf51dec4d2 100644
--- a/src/server/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@@ -118,7 +118,6 @@ export default async (ctx: Koa.Context) => {
username: username,
usernameLower: username.toLowerCase(),
host: null,
- hostLower: null,
keypair: generateKeypair(),
token: secret,
email: null,