Node.js based forum software built for the modern web
feat(intents): gate intents logic behind activitypubEnabled config
Julian Lamacdd63dd2d21
diff --git a/public/src/client/topic/votes.js b/public/src/client/topic/votes.jsindex c3695a97e7..52dca684d1 100644--- a/public/src/client/topic/votes.js+++ b/public/src/client/topic/votes.js@@ -98,6 +98,11 @@ define('forum/topic/votes', [const pid = post.attr('data-pid');if (!app.user.uid) {+ if (!config.activitypub.enabled) {+ ajaxify.go('login');+ return;+ }+let objectId;if (utils.isNumber(pid)) {objectId = config.url + '/post/' + pid;diff --git a/public/src/modules/intents.js b/public/src/modules/intents.jsindex d185f2a086..8ba5f26770 100644--- a/public/src/modules/intents.js+++ b/public/src/modules/intents.js@@ -94,6 +94,10 @@ export async function refresh(handle) {}export async function register() {+ if (!config.activitypub.enabled) {+ return;+ }+let map = list();let handles = await Promise.all(Array.from(map.entries()).map(async ([handle, intents]) => ({handle,@@ -164,6 +168,10 @@ const INTENTS_GUEST_SELECTORS = '[component="topic/reply/guest"], [component="ca// called by various init scripts in different pages' js to add handlers for "Log in to post" buttons, et al.export function addHandlers() {+ if (!config.activitypub.enabled) {+ return;+ }+document.removeEventListener('click', _intentsHandler);document.addEventListener('click', _intentsHandler, true); // capture phase}@@ -190,6 +198,10 @@ function _intentsHandler(e) {}export async function trigger(intent, parameters) {+ if (!config.activitypub.enabled) {+ return;+ }+const map = list();const requiredIntent = intent.toLowerCase();const displayKey = INTENT_DISPLAY_MAP[requiredIntent];diff --git a/src/controllers/api.js b/src/controllers/api.jsindex 4c2f4dc2dd..e000d9db2e 100644--- a/src/controllers/api.js+++ b/src/controllers/api.js@@ -101,6 +101,7 @@ apiController.loadConfig = async function (req) {version: fontawesome_version,},activitypub: {+ enabled: !!meta.config.activitypubEnabled,probe: req.loggedIn ? meta.config.activitypubEnabled && meta.config.activitypubProbe : 0,worldDefaultCid: meta.config.activitypubWorldDefaultCid,},diff --git a/src/controllers/intents.js b/src/controllers/intents.jsindex e9284bbbc1..474611b0a5 100644--- a/src/controllers/intents.js+++ b/src/controllers/intents.js@@ -5,11 +5,16 @@ const categories = require('../categories');const user = require('../user');const helpers = require('./helpers');const activitypub = require('../activitypub');+const meta = require('../meta');const utils = require('../utils');const Intents = module.exports;Intents.create = async (req, res, next) => {+ if (!meta.config.activitypubEnabled) {+ return next();+ }+if (!req.uid) {req.session.returnTo = req.originalUrl;helpers.redirect(res, '/login');diff --git a/src/controllers/write/intents.js b/src/controllers/write/intents.jsindex 6bd1efbe6d..a5f36158e2 100644--- a/src/controllers/write/intents.js+++ b/src/controllers/write/intents.js@@ -5,6 +5,7 @@ const db = require('../../database');const Intents = module.exports;const activitypub = require('../../activitypub');+const meta = require('../../meta');const helpers = require('../helpers');@@ -20,7 +21,11 @@ async function checkRateLimit(ip) {await db.pexpire(key, RATE_LIMIT_WINDOW);}-Intents.query = async (req, res) => {+Intents.query = async (req, res, next) => {+ if (!meta.config.activitypubEnabled) {+ return next();+ }+const ip = req.ip || req.connection.remoteAddress;await checkRateLimit(ip);