natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip

This commit is contained in:
syuilo 2018-04-05 18:50:52 +09:00
parent 7403f38fb4
commit fd87a63e57
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/remote/activitypub/resolve-person.ts
View File

@ -15,7 +15,7 @@ export default async (value, verifier?: string) => {
object.type !== 'Person' || object.type !== 'Person' ||
typeof object.preferredUsername !== 'string' || typeof object.preferredUsername !== 'string' ||
!validateUsername(object.preferredUsername) || !validateUsername(object.preferredUsername) ||
!isValidName(object.name) || (object.name != '' && !isValidName(object.name)) ||
!isValidDescription(object.summary) !isValidDescription(object.summary)
) { ) {
throw new Error('invalid person'); throw new Error('invalid person');

2
src/remote/resolve-user.ts
View File

@ -16,7 +16,7 @@ export default async (username, host, option) => {
const finger = await webFinger(acctLower, acctLower); const finger = await webFinger(acctLower, acctLower);
const self = finger.links.find(link => link.rel && link.rel.toLowerCase() === 'self'); const self = finger.links.find(link => link.rel && link.rel.toLowerCase() === 'self');
if (!self) { if (!self) {
throw new Error(); throw new Error('self link not found');
} }
user = await resolvePerson(self.href, acctLower); user = await resolvePerson(self.href, acctLower);

3
src/server/api/endpoints/users/show.ts
View File

@ -37,7 +37,8 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
if (typeof host === 'string') { if (typeof host === 'string') {
try { try {
user = await resolveRemoteUser(username, host, cursorOption); user = await resolveRemoteUser(username, host, cursorOption);
} catch (exception) { } catch (e) {
console.warn(`failed to resolve remote user: ${e}`);
return rej('failed to resolve remote user'); return rej('failed to resolve remote user');
} }
} else { } else {