refactor: use existing sets for topics (instead of topicRemote, etc.)

This commit is contained in:
Julian Lam
2024-02-07 12:28:16 -05:00
parent 94dcd29e63
commit ec2b375ae9
7 changed files with 49 additions and 29 deletions

View File

@@ -2,6 +2,7 @@
const nconf = require('nconf');
const qs = require('querystring');
const validator = require('validator');
const user = require('../user');
const meta = require('../meta');
@@ -9,14 +10,11 @@ const topics = require('../topics');
const categories = require('../categories');
const posts = require('../posts');
const privileges = require('../privileges');
const activitypub = require('../activitypub');
const helpers = require('./helpers');
const pagination = require('../pagination');
const utils = require('../utils');
const analytics = require('../analytics');
const activitypubController = require('./activitypub');
const topicsController = module.exports;
const url = nconf.get('url');
@@ -24,14 +22,10 @@ const relative_path = nconf.get('relative_path');
const upload_url = nconf.get('upload_url');
topicsController.get = async function getTopic(req, res, next) {
if (req.params.topic_id === 'remote' && activitypub.helpers.isUri(req.query.resource)) {
return activitypubController.topics.get(req, res, next);
}
const tid = req.params.topic_id;
if (
(req.params.post_index && !utils.isNumber(req.params.post_index) && req.params.post_index !== 'unread') ||
!utils.isNumber(tid)
(!utils.isNumber(tid) && !validator.isUUID(tid))
) {
return next();
}