Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: add missing awaits

Browse Source 
fix error message, lock not using second param
This commit is contained in:
Barış Soner Uşaklı
2025-08-26 19:23:39 -04:00
parent 567f453b79
commit 5ee1fd02bb
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/activitypub/notes.js
View File

@@ -56,15 +56,16 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
} }
const id = !activitypub.helpers.isUri(input) ? input.id : input; const id = !activitypub.helpers.isUri(input) ? input.id : input;
const lockStatus = await lock(id, '[[error:activitypub.already-asserting]]'); const lockStatus = await lock(id);
if (!lockStatus) { // unable to achieve lock, stop processing. if (!lockStatus) { // unable to achieve lock, stop processing.
winston.warn('[activitypub/notes.assert] Unable to acquire lock, skipping processing of', id);
return null; return null;
} }
let chain; let chain;
let context = await activitypub.contexts.get(uid, id); let context = await activitypub.contexts.get(uid, id);
if (context.tid) { if (context.tid) {
unlock(id); await unlock(id);
const { tid } = context; const { tid } = context;
return { tid, count: 0 }; return { tid, count: 0 };
} else if (context.context) { } else if (context.context) {
@@ -85,7 +86,7 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
// Can't resolve — give up. // Can't resolve — give up.
if (!chain.length) { if (!chain.length) {
unlock(id); await unlock(id);
return null; return null;
} }
@@ -108,7 +109,7 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
if (tid && members.every(Boolean)) { if (tid && members.every(Boolean)) {
// All cached, return early. // All cached, return early.
activitypub.helpers.log('[notes/assert] No new notes to process.'); activitypub.helpers.log('[notes/assert] No new notes to process.');
unlock(id); await unlock(id);
return { tid, count: 0 }; return { tid, count: 0 };
} }
@@ -137,6 +138,7 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
}).shift(); }).shift();
} catch (e) { } catch (e) {
// noop // noop
winston.error('[activitypub/notes.assert] Could not parse URL of mainPid', e.stack);
} }
if (remoteCid || recipientCids.length) { if (remoteCid || recipientCids.length) {
@@ -169,6 +171,7 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
uid || hasTid || uid || hasTid ||
options.skipChecks || options.cid || options.skipChecks || options.cid ||
await assertRelation(chain[inputIndex !== -1 ? inputIndex : 0]); await assertRelation(chain[inputIndex !== -1 ? inputIndex : 0]);
const privilege = `topics:${tid ? 'reply' : 'create'}`; const privilege = `topics:${tid ? 'reply' : 'create'}`;
const allowed = await privileges.categories.can(privilege, options.cid || cid, activitypub._constants.uid); const allowed = await privileges.categories.can(privilege, options.cid || cid, activitypub._constants.uid);
if (!hasRelation || !allowed) { if (!hasRelation || !allowed) {
@@ -176,7 +179,7 @@ Notes.assert = async (uid, input, options = { skipChecks: false }) => {
activitypub.helpers.log(`[activitypub/notes.assert] Not asserting ${id} as it has no relation to existing tracked content.`); activitypub.helpers.log(`[activitypub/notes.assert] Not asserting ${id} as it has no relation to existing tracked content.`);
} }
unlock(id); await unlock(id);
return null; return null;
} }