graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-23 20:13:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1408 from akihikodaki/person

Browse source 
Resolve local Person ID
This commit is contained in:
syuilo 2018-04-06 20:47:07 +09:00 committed by GitHub
commit 358de80e65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/remote/activitypub/resolve-person.ts
View file

@ -1,5 +1,7 @@
import { JSDOM } from 'jsdom';
import { toUnicode } from 'punycode';
import parseAcct from '../../acct/parse';
import config from '../../config';
import User, { validateUsername, isValidName, isValidDescription } from '../../models/user';
import { createHttp } from '../../queue';
import webFinger from '../webfinger';
@ -10,10 +12,18 @@ async function isCollection(collection) {
}
export default async (parentResolver, value, verifier?: string) => {
const id = value.id || value;
const localPrefix = config.url + '/@';
if (id.startsWith(localPrefix)) {
return User.findOne(parseAcct(id.slice(localPrefix)));
}
const { resolver, object } = await parentResolver.resolveOne(value);
if (
object === null ||
object.id !== id ||
object.type !== 'Person' ||
typeof object.preferredUsername !== 'string' ||
!validateUsername(object.preferredUsername) ||
@ -36,7 +46,7 @@ export default async (parentResolver, value, verifier?: string) => {
resolved => isCollection(resolved.object) ? resolved.object : null,
() => null
),
webFinger(object.id, verifier),
webFinger(id, verifier),
]);
const host = toUnicode(finger.subject.replace(/^.*?@/, ''));
@ -64,7 +74,7 @@ export default async (parentResolver, value, verifier?: string) => {
publicKeyPem: object.publicKey.publicKeyPem
},
inbox: object.inbox,
uri: object.id,
uri: id,
},
});