diff options
Diffstat (limited to 'src/remote')
| -rw-r--r-- | src/remote/activitypub/objects/person.ts | 4 | ||||
| -rw-r--r-- | src/remote/resolve-user.ts | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/remote/activitypub/objects/person.ts b/src/remote/activitypub/objects/person.ts index f7ec064cdb..6c060f879c 100644 --- a/src/remote/activitypub/objects/person.ts +++ b/src/remote/activitypub/objects/person.ts @@ -74,8 +74,7 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs webFinger(person.id) ]); - const host = toUnicode(finger.subject.replace(/^.*?@/, '')); - const hostLower = host.replace(/[A-Z]+/, matched => matched.toLowerCase()); + const host = toUnicode(finger.subject.replace(/^.*?@/, '')).toLowerCase(); const summaryDOM = JSDOM.fragment(person.summary); // Create user @@ -92,7 +91,6 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs username: person.preferredUsername, usernameLower: person.preferredUsername.toLowerCase(), host, - hostLower, publicKey: { id: person.publicKey.id, publicKeyPem: person.publicKey.publicKeyPem diff --git a/src/remote/resolve-user.ts b/src/remote/resolve-user.ts index 346e134c9f..5cb35cadef 100644 --- a/src/remote/resolve-user.ts +++ b/src/remote/resolve-user.ts @@ -4,19 +4,19 @@ import webFinger from './webfinger'; import config from '../config'; import { createPerson } from './activitypub/objects/person'; -export default async (username, host, option) => { +export default async (username, _host, option) => { const usernameLower = username.toLowerCase(); - const hostLowerAscii = toASCII(host).toLowerCase(); - const hostLower = toUnicode(hostLowerAscii); + const hostAscii = toASCII(_host).toLowerCase(); + const host = toUnicode(hostAscii); - if (config.host == hostLower) { + if (config.host == host) { return await User.findOne({ usernameLower }); } - let user = await User.findOne({ usernameLower, hostLower }, option); + let user = await User.findOne({ usernameLower, host }, option); if (user === null) { - const acctLower = `${usernameLower}@${hostLowerAscii}`; + const acctLower = `${usernameLower}@${hostAscii}`; const finger = await webFinger(acctLower); const self = finger.links.find(link => link.rel && link.rel.toLowerCase() === 'self'); |