diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-04-09 04:08:56 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-04-09 04:08:56 +0900 |
| commit | 08beb45935961066ddc543b1659f5cc6e891aa6c (patch) | |
| tree | d9237be040da1317f5f3b7eb0c60e5cfbf8b6fce /src/remote/resolve-user.ts | |
| parent | Merge pull request #1422 from unarist/fix/username-regex (diff) | |
| download | sharkey-08beb45935961066ddc543b1659f5cc6e891aa6c.tar.gz sharkey-08beb45935961066ddc543b1659f5cc6e891aa6c.tar.bz2 sharkey-08beb45935961066ddc543b1659f5cc6e891aa6c.zip | |
wip
Diffstat (limited to 'src/remote/resolve-user.ts')
| -rw-r--r-- | src/remote/resolve-user.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/remote/resolve-user.ts b/src/remote/resolve-user.ts index 0e7edd8e12..346e134c9f 100644 --- a/src/remote/resolve-user.ts +++ b/src/remote/resolve-user.ts @@ -1,8 +1,8 @@ import { toUnicode, toASCII } from 'punycode'; import User from '../models/user'; -import resolvePerson from './activitypub/resolve-person'; import webFinger from './webfinger'; import config from '../config'; +import { createPerson } from './activitypub/objects/person'; export default async (username, host, option) => { const usernameLower = username.toLowerCase(); @@ -18,13 +18,13 @@ export default async (username, host, option) => { if (user === null) { const acctLower = `${usernameLower}@${hostLowerAscii}`; - const finger = await webFinger(acctLower, acctLower); + const finger = await webFinger(acctLower); const self = finger.links.find(link => link.rel && link.rel.toLowerCase() === 'self'); if (!self) { throw new Error('self link not found'); } - user = await resolvePerson(self.href, acctLower); + user = await createPerson(self.href); } return user; |