summaryrefslogtreecommitdiff
path: root/src/remote/resolve-user.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-04-08 15:25:17 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-04-08 15:25:17 +0900
commit6d49edc0ab7af36f5d0d54397ddb1eacbb9c18b4 (patch)
treeed5663433c9cf1e78c176ddf731aba79792c07f0 /src/remote/resolve-user.ts
parentUse id in uri instead of username (diff)
downloadsharkey-6d49edc0ab7af36f5d0d54397ddb1eacbb9c18b4.tar.gz
sharkey-6d49edc0ab7af36f5d0d54397ddb1eacbb9c18b4.tar.bz2
sharkey-6d49edc0ab7af36f5d0d54397ddb1eacbb9c18b4.zip
:v:
Diffstat (limited to 'src/remote/resolve-user.ts')
-rw-r--r--src/remote/resolve-user.ts5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/remote/resolve-user.ts b/src/remote/resolve-user.ts
index 9e1ae51952..0e7edd8e12 100644
--- a/src/remote/resolve-user.ts
+++ b/src/remote/resolve-user.ts
@@ -2,12 +2,17 @@ import { toUnicode, toASCII } from 'punycode';
import User from '../models/user';
import resolvePerson from './activitypub/resolve-person';
import webFinger from './webfinger';
+import config from '../config';
export default async (username, host, option) => {
const usernameLower = username.toLowerCase();
const hostLowerAscii = toASCII(host).toLowerCase();
const hostLower = toUnicode(hostLowerAscii);
+ if (config.host == hostLower) {
+ return await User.findOne({ usernameLower });
+ }
+
let user = await User.findOne({ usernameLower, hostLower }, option);
if (user === null) {