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

chore: move assertNote to separate file in preparation for additional note-based methods

Browse Source
This commit is contained in:
Julian Lam
2024-01-11 10:05:02 -05:00
parent ab40ba6167
commit 2b3b6e56af
3 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/activitypub/index.js
View File

@@ -15,6 +15,7 @@ const ActivityPub = module.exports;
ActivityPub.helpers = require('./helpers'); ActivityPub.helpers = require('./helpers');
ActivityPub.inbox = require('./inbox'); ActivityPub.inbox = require('./inbox');
ActivityPub.mocks = require('./mocks'); ActivityPub.mocks = require('./mocks');
ActivityPub.notes = require('./notes');
ActivityPub.getActor = async (uid, input) => { ActivityPub.getActor = async (uid, input) => {
// Can be a webfinger id, uri, or object, handle as appropriate // Can be a webfinger id, uri, or object, handle as appropriate
@@ -61,25 +62,6 @@ ActivityPub.resolveInboxes = async (uid, ids) => await Promise.all(ids.map(async
return actor.inbox; return actor.inbox;
})); }));
ActivityPub.assertNotes = async (uid, ids) => {
// Ensures that each note has been saved to the database
const keys = ids.map(id => `post:${id}`);
await Promise.all(ids.map(async (id, idx) => {
const key = keys[idx];
const exists = await db.exists(key);
winston.verbose(`[activitypub/assertNotes] Asserting note id ${id}`);
let postData;
if (!exists) {
winston.verbose(`[activitypub/assertNotes] Not found, saving note to database`);
const object = await ActivityPub.get(uid, id);
postData = await ActivityPub.mocks.post(object);
await db.setObject(key, postData);
}
}));
};
ActivityPub.getPublicKey = async (uid) => { ActivityPub.getPublicKey = async (uid) => {
let publicKey; let publicKey;

2
src/posts/index.js
View File

@@ -47,7 +47,7 @@ Posts.getPostsByPids = async function (pids, uid) {
} }
const remotePids = pids.filter(pid => !utils.isNumber(pid)); const remotePids = pids.filter(pid => !utils.isNumber(pid));
await activitypub.assertNotes(uid, remotePids); await activitypub.notes.assert(uid, remotePids);
let posts = await Posts.getPostsData(pids); let posts = await Posts.getPostsData(pids);
posts = await Promise.all(posts.map(Posts.parsePost)); posts = await Promise.all(posts.map(Posts.parsePost));
const data = await plugins.hooks.fire('filter:post.getPosts', { posts: posts, uid: uid }); const data = await plugins.hooks.fire('filter:post.getPosts', { posts: posts, uid: uid });

2
src/topics/posts.js
View File

@@ -187,7 +187,7 @@ module.exports = function (Topics) {
return; return;
} }
parentPids = _.uniq(parentPids); parentPids = _.uniq(parentPids);
await activitypub.assertNotes(uid, parentPids.filter(pid => activitypub.helpers.isUri(pid))); await activitypub.notes.assert(uid, parentPids.filter(pid => activitypub.helpers.isUri(pid)));
const parentPosts = await posts.getPostsFields(parentPids, ['uid']); const parentPosts = await posts.getPostsFields(parentPids, ['uid']);
const parentUids = _.uniq(parentPosts.map(postObj => postObj && postObj.uid)); const parentUids = _.uniq(parentPosts.map(postObj => postObj && postObj.uid));
const userData = await user.getUsersFields(parentUids, ['username']); const userData = await user.getUsersFields(parentUids, ['username']);