From 7037d879486b862a0432375813f45f4e1eea5196 Mon Sep 17 00:00:00 2001 From: CaramelKat <32065563+caramelkat@users.noreply.github.com> Date: Wed, 29 Sep 2021 15:00:15 -0500 Subject: [PATCH] Added support for loading community by title_id instead of community_id --- .../juxt-web/routes/console/communities.js | 27 +++++++++++++++++++ .../juxt-web/routes/console/userpage.js | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/services/juxt-web/routes/console/communities.js b/src/services/juxt-web/routes/console/communities.js index 88ba141..4a3b582 100644 --- a/src/services/juxt-web/routes/console/communities.js +++ b/src/services/juxt-web/routes/console/communities.js @@ -49,6 +49,33 @@ router.get('/announcements', async function (req, res) { }); }); +router.get('/:communityID', async function (req, res) { + let user = await database.getUserByPID(req.pid); + if(req.params.communityID === 'announcements') + res.redirect('/communities/announcements') + let community = await database.getCommunityByID(req.params.communityID.toString()); + if(community === null && req.query.title_id) + community = await database.getCommunityByTitleID(req.query.title_id) + if(community === null) + return res.sendStatus(404); + let communityMap = await util.data.getCommunityHash(); + let newPosts = await database.getNumberNewCommunityPostsByID(community, 5); + let totalNumPosts = await database.getTotalPostsByCommunity(community) + res.render(req.directory + '/community.ejs', { + // EJS variable and server-side variable + moment: moment, + community: community, + communityMap: communityMap, + newPosts: newPosts, + totalNumPosts: totalNumPosts, + user: user, + account_server: config.account_server_domain.slice(8), + cdnURL: config.CDN_domain, + lang: req.lang, + mii_image_CDN: config.mii_image_CDN + }); +}); + router.get('/:communityID/:type', async function (req, res) { let user = await database.getUserByPID(req.pid); if(req.params.communityID === 'announcements') diff --git a/src/services/juxt-web/routes/console/userpage.js b/src/services/juxt-web/routes/console/userpage.js index 95cb103..6fe3be9 100644 --- a/src/services/juxt-web/routes/console/userpage.js +++ b/src/services/juxt-web/routes/console/userpage.js @@ -58,7 +58,7 @@ router.get('/show', async function (req, res) { let parentUser = await database.getUserByPID(req.pid); let user = await database.getUserByPID(userID); if(user === null) - res.sendStatus(404); + return res.sendStatus(404); if(parentUser === user) res.redirect('/users/me'); let newPosts = await database.getNumberUserPostsByID(user.pid, 10);