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

Fix bug

Browse source
This commit is contained in:
syuilo 2019-03-08 19:45:01 +09:00
parent 60604b6f51
commit 76cff98220
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
1 changed files with 49 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/remote/activitypub/request.ts
View file

@ -14,7 +14,7 @@ import Instance from '../../models/instance';
export const logger = apLogger.createSubLogger('deliver'); export const logger = apLogger.createSubLogger('deliver');
export default (user: ILocalUser, url: string, object: any) => new Promise(async (resolve, reject) => { export default async (user: ILocalUser, url: string, object: any) => {
logger.info(`--> ${url}`); logger.info(`--> ${url}`);
const timeout = 10 * 1000; const timeout = 10 * 1000;
@ -32,9 +32,10 @@ export default (user: ILocalUser, url: string, object: any) => new Promise(async
sha256.update(data); sha256.update(data);
const hash = sha256.digest('base64'); const hash = sha256.digest('base64');
const addr = await resolveAddr(hostname).catch(e => reject(e)); const addr = await resolveAddr(hostname);
if (!addr) return; if (!addr) return;
const _ = new Promise((resolve, reject) => {
const req = request({ const req = request({
protocol, protocol,
hostname: addr, hostname: addr,
@ -79,6 +80,9 @@ export default (user: ILocalUser, url: string, object: any) => new Promise(async
}); });
req.end(data); req.end(data);
});
await _;
//#region Log //#region Log
publishApLogStream({ publishApLogStream({
@ -88,7 +92,7 @@ export default (user: ILocalUser, url: string, object: any) => new Promise(async
actor: user.username actor: user.username
}); });
//#endregion //#endregion
}); };
/** /**
* Resolve host (with cached, asynchrony) * Resolve host (with cached, asynchrony)