summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-08-23 14:56:43 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-08-23 14:56:43 +0900
commita62e2b83fff69d16010e93c49be9059121aebdb3 (patch)
tree35500dd502cb997db0799c207010b2fb75e5cb28
parentFix bug: Check following request existance (diff)
parentMerge pull request #2419 from rinsuki/patch-1 (diff)
downloadsharkey-a62e2b83fff69d16010e93c49be9059121aebdb3.tar.gz
sharkey-a62e2b83fff69d16010e93c49be9059121aebdb3.tar.bz2
sharkey-a62e2b83fff69d16010e93c49be9059121aebdb3.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
-rw-r--r--src/remote/resolve-user.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/remote/resolve-user.ts b/src/remote/resolve-user.ts
index 1e8fc5d750..e199b6f147 100644
--- a/src/remote/resolve-user.ts
+++ b/src/remote/resolve-user.ts
@@ -15,7 +15,7 @@ export default async (username: string, _host: string, option?: any): Promise<IU
const host = toUnicode(hostAscii);
if (config.host == host) {
- return await User.findOne({ usernameLower });
+ return await User.findOne({ usernameLower, host: null });
}
let user = await User.findOne({ usernameLower, host }, option);