Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-27 17:11:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: minor re-shuffling of code

Browse Source
This commit is contained in:
Julian Lam
2023-12-07 12:36:30 -05:00
parent 99cc60c8d5
commit 5e693702a4
4 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/activitypub/index.js
View File

@@ -13,7 +13,6 @@ const ActivityPub = module.exports;
ActivityPub.helpers = require('./helpers'); ActivityPub.helpers = require('./helpers');
ActivityPub.inbox = require('./inbox'); ActivityPub.inbox = require('./inbox');
ActivityPub.outbox = require('./outbox');
ActivityPub.getActor = async (id) => { ActivityPub.getActor = async (id) => {
if (actorCache.has(id)) { if (actorCache.has(id)) {

13
src/activitypub/outbox.js
View File

@@ -1,13 +0,0 @@
'use strict';
const db = require('../database');
const outbox = module.exports;
outbox.isFollowing = async (uid, actorId) => {
if (parseInt(uid, 10) <= 0 || actorId.indexOf('@') === -1) {
return false;
}
return await db.isSortedSetMember(`followingRemote:${uid}`, actorId);
};

5
src/controllers/activitypub/profiles.js
View File

@@ -1,6 +1,7 @@
'use strict'; 'use strict';
const { getActor, outbox } = require('../../activitypub'); const db = require('../../database');
const { getActor } = require('../../activitypub');
const controller = module.exports; const controller = module.exports;
@@ -11,7 +12,7 @@ controller.get = async function (req, res, next) {
return next(); return next();
} }
const { preferredUsername, published, icon, image, name, summary, hostname } = actor; const { preferredUsername, published, icon, image, name, summary, hostname } = actor;
const isFollowing = await outbox.isFollowing(req.uid, uid); const isFollowing = await db.isSortedSetMember(`followingRemote:${req.uid}`, uid);
const payload = { const payload = {
uid, uid,

8
src/routes/activitypub.js
View File

@@ -5,12 +5,12 @@ module.exports = function (app, middleware, controllers) {
app.get('/user/:userslug', middlewares, controllers.activitypub.getActor); app.get('/user/:userslug', middlewares, controllers.activitypub.getActor);
app.get('/user/:userslug/following', middlewares, controllers.activitypub.getFollowing); app.get('/user/:userslug/inbox', middlewares, controllers.activitypub.getInbox);
app.get('/user/:userslug/followers', middlewares, controllers.activitypub.getFollowers); app.post('/user/:userslug/inbox', [...middlewares, middleware.validateActivity], controllers.activitypub.postInbox);
app.get('/user/:userslug/outbox', middlewares, controllers.activitypub.getOutbox); app.get('/user/:userslug/outbox', middlewares, controllers.activitypub.getOutbox);
app.post('/user/:userslug/outbox', middlewares, controllers.activitypub.postOutbox); app.post('/user/:userslug/outbox', middlewares, controllers.activitypub.postOutbox);
app.get('/user/:userslug/inbox', middlewares, controllers.activitypub.getInbox); app.get('/user/:userslug/following', middlewares, controllers.activitypub.getFollowing);
app.post('/user/:userslug/inbox', [...middlewares, middleware.validateActivity], controllers.activitypub.postInbox); app.get('/user/:userslug/followers', middlewares, controllers.activitypub.getFollowers);
}; };