Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: add timeout on activitypub.get, tweak upgrade script

Browse Source
This commit is contained in:
Julian Lam
2024-04-04 12:22:13 -04:00
parent 943cef6da2
commit 442e98e4da
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/activitypub/index.js
View File

@@ -202,6 +202,7 @@ ActivityPub.get = async (type, id, uri) => {
...headers, ...headers,
Accept: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', Accept: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
}, },
timeout: 5000,
}); });
if (!String(response.statusCode).startsWith('2')) { if (!String(response.statusCode).startsWith('2')) {

9
src/upgrades/4.0.0/remote_user_urls.js
View File

@@ -12,7 +12,14 @@ module.exports = {
method: async () => { method: async () => {
const batch = require('../../batch'); const batch = require('../../batch');
const { progress } = this; const { progress } = this;
const interval = 5000;
await batch.processSortedSet('usersRemote:lastCrawled', async ids => await activitypub.actors.assert(ids, { update: true }), { progress }); await batch.processSortedSet('usersRemote:lastCrawled', async (ids) => {
try {
await activitypub.actors.assert(ids, { update: true });
} catch (e) {
// noop
}
}, { progress, interval });
}, },
}; };