diff --git a/src/controllers/404Controller.js b/src/controllers/404Controller.js
index d1cb234..03f08aa 100644
--- a/src/controllers/404Controller.js
+++ b/src/controllers/404Controller.js
@@ -14,8 +14,11 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+
//Local Imports
-const navRender = require('./navRender');
+const csrfUtils = require('../utils/csrfUtils');
//register page functions
module.exports = async function(req, res){
@@ -23,5 +26,5 @@ module.exports = async function(req, res){
res.status(404);
//Render page
- return navRender.render(req, res, '404');
+ return res.render('404', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req)});
}
\ No newline at end of file
diff --git a/src/controllers/aboutController.js b/src/controllers/aboutController.js
index a1f72b4..11c6faf 100644
--- a/src/controllers/aboutController.js
+++ b/src/controllers/aboutController.js
@@ -19,10 +19,10 @@ const config = require('../../config.json');
const package = require('../../package.json');
//Local Imports
-const navRender = require('./navRender');
+const csrfUtils = require('../utils/csrfUtils');
//register page functions
module.exports.get = async function(req, res){
//Render page
- return navRender.render(req, res, 'about', {aboutText: config.aboutText, version: package.canopyDisplayVersion});
+ return res.render('about', {aboutText: config.aboutText, instance: config.instanceName, links: config.links, user: req.session.user, version: package.canopyDisplayVersion, csrfToken: csrfUtils.generateToken(req)});
}
\ No newline at end of file
diff --git a/src/controllers/adminPanelController.js b/src/controllers/adminPanelController.js
index a27eba7..53c8f55 100644
--- a/src/controllers/adminPanelController.js
+++ b/src/controllers/adminPanelController.js
@@ -21,10 +21,10 @@ const config = require('../../config.json');
const validator = require('validator');//No express here, so regular validator it is!
//Local Imports
-const navRender = require('./navRender');
const {userModel} = require('../schemas/user/userSchema');
const permissionModel = require('../schemas/permissionSchema');
const channelModel = require('../schemas/channel/channelSchema');
+const csrfUtils = require('../utils/csrfUtils');
const {exceptionHandler, errorHandler} = require("../utils/loggerUtils");
//register page functions
@@ -41,11 +41,14 @@ module.exports.get = async function(req, res){
delete permList.__v;
//Render out the page
- return navRender.render(req, res, 'adminPanel', {
+ return res.render('adminPanel', {
+ instance: config.instanceName, links: config.links,
+ user: req.session.user,
rankEnum: permissionModel.rankEnum,
chanGuide: chanGuide,
userList: userList,
permList: permList,
+ csrfToken: csrfUtils.generateToken(req),
unescape: validator.unescape
});
diff --git a/src/controllers/channelController.js b/src/controllers/channelController.js
index 0ecd09d..1367a47 100644
--- a/src/controllers/channelController.js
+++ b/src/controllers/channelController.js
@@ -14,10 +14,13 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+
//Local Imports
-const navRender = require('./navRender');
+const csrfUtils = require('../utils/csrfUtils');
//channel functions
module.exports.get = function(req, res){
- return navRender.render(req, res, 'channel');
+ res.render('channel', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req)});
}
\ No newline at end of file
diff --git a/src/controllers/channelSettingsController.js b/src/controllers/channelSettingsController.js
index f57ebbd..08503ca 100644
--- a/src/controllers/channelSettingsController.js
+++ b/src/controllers/channelSettingsController.js
@@ -14,42 +14,35 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+
//NPM Imports
const validator = require('validator');//No express here, so regular validator it is!
//local imports
-const navRender = require('./navRender');
const channelModel = require('../schemas/channel/channelSchema');
const permissionModel = require('../schemas/permissionSchema');
+const csrfUtils = require('../utils/csrfUtils');
const {exceptionHandler, errorHandler} = require('../utils/loggerUtils');
//root index functions
module.exports.get = async function(req, res){
try{
- //Get chan name and pull from DB
const chanName = (req.url.slice(1).replace('/settings',''));
const chanDB = await channelModel.findOne({name: chanName});
const reqRank = await chanDB.getChannelRank(req.session.user);
- //gank user objects and stuffem into the rank list
await chanDB.populate("rankList.user");
//Take out the permissions doc id since we don't need it.
delete chanDB.permissions._doc._id;
- //If the channel doesnt exist
if(chanDB == null){
- //Pitch a fit
throw loggerUtils.exceptionSmith("Channel not found.", "queue");
}
- //REnder dat bitch out
- return navRender.render(req, res, 'channelSettings', {
- channel: chanDB,
- reqRank,
- rankEnum: permissionModel.rankEnum,
- unescape: validator.unescape
- });
+ return res.render('channelSettings', {instance: config.instanceName, links: config.links, user: req.session.user, channel: chanDB, reqRank, rankEnum: permissionModel.rankEnum, csrfToken: csrfUtils.generateToken(req), unescape: validator.unescape});
}catch(err){
return exceptionHandler(res, err);
}
diff --git a/src/controllers/emailChangeController.js b/src/controllers/emailChangeController.js
index 8df413f..3085410 100644
--- a/src/controllers/emailChangeController.js
+++ b/src/controllers/emailChangeController.js
@@ -14,12 +14,15 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+
//NPM Imports
const {validationResult, matchedData} = require('express-validator');
//local imports
-const navRender = require('./navRender');
const emailChangeModel = require('../schemas/user/emailChangeSchema');
+const csrfUtils = require('../utils/csrfUtils');
//gateway for resetting password
module.exports.get = async function(req, res){
@@ -37,18 +40,18 @@ module.exports.get = async function(req, res){
//If we have an invalid request
if(requestDB == null){
- return navRender.render(req, res, 'emailChange', {valid: false});
+ return res.render('emailChange', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: false});
}
//Speak of our success (don't wait for the emails to be sent)
- navRender.render(req, res, 'emailChange', {valid: true});
+ res.render('emailChange', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: true});
//Consume the request
await requestDB.consume();
}else{
- return navRender.render(req, res, 'emailChange', {valid: false});
+ return res.render('emailChange', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: false});
}
}catch(err){
- return navRender.render(req, res, 'emailChange', {valid: false});
+ return res.render('emailChange', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: false});
}
}
\ No newline at end of file
diff --git a/src/controllers/hrtController.js b/src/controllers/hrtController.js
index 9d26113..6e4cbf4 100644
--- a/src/controllers/hrtController.js
+++ b/src/controllers/hrtController.js
@@ -14,11 +14,15 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+const package = require('../../package.json');
+
//Local Imports
-const navRender = require('./navRender');
+const csrfUtils = require('../utils/csrfUtils');
//register page functions
module.exports.get = async function(req, res){
//Render page
- return navRender.render(req, res,'hrt');
+ return res.render('hrt', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req)});
}
\ No newline at end of file
diff --git a/src/controllers/indexController.js b/src/controllers/indexController.js
index 537656f..3e30983 100644
--- a/src/controllers/indexController.js
+++ b/src/controllers/indexController.js
@@ -14,19 +14,22 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+
//NPM Imports
const validator = require('validator');//No express here, so regular validator it is!
//local imports
-const navRender = require('./navRender');
const channelModel = require('../schemas/channel/channelSchema');
+const csrfUtils = require('../utils/csrfUtils');
const {exceptionHandler, errorHandler} = require('../utils/loggerUtils');
//root index functions
module.exports.get = async function(req, res){
try{
const chanGuide = await channelModel.getChannelList();
- return navRender.render(req, res, 'index', {chanGuide: chanGuide, unescape: validator.unescape})
+ return res.render('index', {instance: config.instanceName, links: config.links, user: req.session.user, chanGuide: chanGuide, csrfToken: csrfUtils.generateToken(req), unescape: validator.unescape});
}catch(err){
return exceptionHandler(res, err);
}
diff --git a/src/controllers/loginController.js b/src/controllers/loginController.js
index 06aafea..58fd64a 100644
--- a/src/controllers/loginController.js
+++ b/src/controllers/loginController.js
@@ -14,13 +14,16 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+
//NPM Imports
const {validationResult, matchedData} = require('express-validator');
//Local Imports
-const navRender = require('./navRender');
const sessionUtils = require('../utils/sessionUtils');
const altchaUtils = require('../utils/altchaUtils');
+const csrfUtils = require('../utils/csrfUtils');
//register page functions
module.exports.get = async function(req, res){
@@ -42,7 +45,7 @@ module.exports.get = async function(req, res){
//if we have previous attempts for this user
if(attempts != null){
if(attempts.count > sessionUtils.maxAttempts){
- return navRender.render(req, res, 'lockedAccount');
+ return res.render('lockedAccount', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req)});
}
//If the users login's are being throttled
@@ -53,16 +56,16 @@ module.exports.get = async function(req, res){
const challenge = await altchaUtils.genCaptcha(difficulty, user);
//Render page
- return navRender.render(req, res, 'login', {challenge});
+ return res.render('login', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)});
}
//otherwise
}else{
//Render generic page
- return navRender.render(req, res, 'login', {challenge: null});
+ return res.render('login', {instance: config.instanceName, links: config.links, user: req.session.user, challenge: null, csrfToken: csrfUtils.generateToken(req)});
}
//if we received invalid input
}else{
//Render pretend nothing happened, send out a generic page
- return navRender.render(req, res, 'login', {challenge: null});
+ return res.render('login', {instance: config.instanceName, links: config.links, user: req.session.user, challenge: null, csrfToken: csrfUtils.generateToken(req)});
}
}
\ No newline at end of file
diff --git a/src/controllers/migrateController.js b/src/controllers/migrateController.js
index b386d86..d069956 100644
--- a/src/controllers/migrateController.js
+++ b/src/controllers/migrateController.js
@@ -14,9 +14,12 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+
//Local Imports
-const navRender = require('./navRender');
const altchaUtils = require('../utils/altchaUtils');
+const csrfUtils = require('../utils/csrfUtils');
//register page functions
module.exports.get = async function(req, res){
@@ -24,5 +27,5 @@ module.exports.get = async function(req, res){
const challenge = await altchaUtils.genCaptcha();
//Render page
- return navRender.render(req, res, 'migrate', {challenge});
+ return res.render('migrate', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)});
}
\ No newline at end of file
diff --git a/src/controllers/navRender.js b/src/controllers/navRender.js
deleted file mode 100644
index 57dc8ca..0000000
--- a/src/controllers/navRender.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*Canopy - The next generation of stoner streaming software
-Copyright (C) 2024-2026 Rainbownapkin and the TTN Community
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see .*/
-
-//Config
-const config = require('../../config.json');
-
-//Local Imports
-const csrfUtils = require('../utils/csrfUtils');
-const presenceUtils = require('../utils/presenceUtils');
-
-/* You could make the argument this should be middleware that passes a properties object to user
- But then I'd writing out all the other controllers properties as I am below, or worse. Not a great option.*/
-//Renders a given page with properties required for the navbar
-module.exports.render = async function(req, res, template, properties = {}){
-
- //Set required properties on top of passed object
- properties.instance = config.instanceName;
- properties.links = config.links;
- properties.user = req.session.user
- properties.csrfToken = csrfUtils.generateToken(req)
- properties.userCount = (await presenceUtils.getOnlineUsers()).length;
-
- //Render out template, passing given properties with navbar required properties added
- return res.render(template, properties);
-}
\ No newline at end of file
diff --git a/src/controllers/newChannelController.js b/src/controllers/newChannelController.js
index 224a5df..73101b0 100644
--- a/src/controllers/newChannelController.js
+++ b/src/controllers/newChannelController.js
@@ -15,8 +15,11 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
//Local Imports
-const navRender = require('./navRender');
const altchaUtils = require('../utils/altchaUtils');
+const csrfUtils = require('../utils/csrfUtils');
+
+//Config
+const config = require('../../config.json');
//root index functions
module.exports.get = async function(req, res){
@@ -24,5 +27,5 @@ module.exports.get = async function(req, res){
const challenge = await altchaUtils.genCaptcha();
//render the page
- return navRender.render(req, res, 'newChannel', {challenge});
+ return res.render('newChannel', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)});
}
\ No newline at end of file
diff --git a/src/controllers/passwordResetController.js b/src/controllers/passwordResetController.js
index b7b22f2..2aa81f4 100644
--- a/src/controllers/passwordResetController.js
+++ b/src/controllers/passwordResetController.js
@@ -14,12 +14,15 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+
//npm imports
const {validationResult, matchedData} = require('express-validator');
//Local Imports
-const navRender = require('./navRender');
const altchaUtils = require('../utils/altchaUtils');
+const csrfUtils = require('../utils/csrfUtils');
//register page functions
module.exports.get = async function(req, res){
@@ -44,11 +47,11 @@ module.exports.get = async function(req, res){
*/
//Render page
- return navRender.render(req, res, 'passwordReset', {challenge, token});
+ return res.render('passwordReset', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, token, csrfToken: csrfUtils.generateToken(req)});
//If we didn't get a valid token
}else{
//otherwise render generic page
- return navRender.render(req, res, 'passwordReset', {challenge, token: null});
+ return res.render('passwordReset', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, token: null, csrfToken: csrfUtils.generateToken(req)});
}
}catch(err){
return exceptionHandler(res, err);
diff --git a/src/controllers/profileController.js b/src/controllers/profileController.js
index cb7c846..e35f195 100644
--- a/src/controllers/profileController.js
+++ b/src/controllers/profileController.js
@@ -15,14 +15,17 @@ You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
//Local Imports
-const navRender = require('./navRender');
const {userModel} = require('../schemas/user/userSchema');
+const csrfUtils = require('../utils/csrfUtils');
const presenceUtils = require('../utils/presenceUtils');
const {exceptionHandler, errorHandler} = require('../utils/loggerUtils');
//NPM Imports
const validator = require('validator');//No express here, so regular validator it is!
+//Config
+const config = require('../../config.json');
+
//profile functions
module.exports.get = async function(req, res){
@@ -38,17 +41,23 @@ module.exports.get = async function(req, res){
//Pull presence (should be quick since everyone whos been on since last startup will be backed in RAM)
const presence = await presenceUtils.getPresence(profile.user);
- navRender.render(req, res, 'profile', {
+ res.render('profile', {
+ instance: config.instanceName, links: config.links,
+ user: req.session.user,
profile,
selfProfile,
presence,
+ csrfToken: csrfUtils.generateToken(req),
unescape: validator.unescape
});
}else{
- navRender.render(req, res, 'profile', {
+ res.render('profile', {
+ instance: config.instanceName, links: config.links,
+ user: req.session.user,
profile: null,
selfProfile: false,
presence: null,
+ csrfToken: csrfUtils.generateToken(req),
unescape: validator.unescape
});
}
diff --git a/src/controllers/registerController.js b/src/controllers/registerController.js
index 89c8aaa..f9b9d67 100644
--- a/src/controllers/registerController.js
+++ b/src/controllers/registerController.js
@@ -14,9 +14,12 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+
//Local Imports
-const navRender = require('./navRender');
const altchaUtils = require('../utils/altchaUtils');
+const csrfUtils = require('../utils/csrfUtils');
//register page functions
module.exports.get = async function(req, res){
@@ -24,5 +27,5 @@ module.exports.get = async function(req, res){
const challenge = await altchaUtils.genCaptcha();
//Render page
- return navRender.render(req, res, 'register', {challenge});
+ return res.render('register', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)});
}
\ No newline at end of file
diff --git a/src/controllers/streamInfoController.js b/src/controllers/streamInfoController.js
index 05644db..22aef11 100644
--- a/src/controllers/streamInfoController.js
+++ b/src/controllers/streamInfoController.js
@@ -14,11 +14,15 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see .*/
+//Config
+const config = require('../../config.json');
+const package = require('../../package.json');
+
//Local Imports
-const navRender = require('./navRender');
+const csrfUtils = require('../utils/csrfUtils');
//register page functions
module.exports.get = async function(req, res){
//Render page
- return navRender.render(req, res, 'streamInfo');
+ return res.render('streamInfo', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req)});
}
\ No newline at end of file
diff --git a/src/utils/presenceUtils.js b/src/utils/presenceUtils.js
index 35326ba..87acb97 100644
--- a/src/utils/presenceUtils.js
+++ b/src/utils/presenceUtils.js
@@ -28,26 +28,6 @@ const tolerance = 2 * (60 * 1000);
//Defaults to five minutes
const offlineTimeout = 5 * (60 * 1000);
-module.exports.getOnlineUsers = async function(){
- //Define array to hold list of online users
- const users = [];
-
- //Iterate through all users in the RAM-Backed activity map (only ones that would be online)
- for(const key of Array.from(activityMap.keys())){
- //Grab current user, should grab from ram since we're polling activityMap
- const user = await module.exports.getPresence(key);
-
- //If the user is online
- if(user.status == "Streaming" || user.status == "Recently Active"){
- //Addem' to da list
- users.push(user);
- }
- }
-
- //Return all found users
- return users;
-}
-
module.exports.getPresence = async function(user, userDB){
//If we don't have a user
if(user == null || user == '' || user == 'Tokebot'){
@@ -64,7 +44,7 @@ module.exports.getPresence = async function(user, userDB){
//If we couldn't find anything in RAM
if(activity == null){
- //If we wheren't handed a free user doc, and we're allowed to pull from DB
+ //If we wheren't handed a free user doc
if(userDB == null){
//Pull one from the username
userDB = await userModel.findOne({user: user});
diff --git a/src/views/partial/navbar.ejs b/src/views/partial/navbar.ejs
index 696805b..cd58614 100644
--- a/src/views/partial/navbar.ejs
+++ b/src/views/partial/navbar.ejs
@@ -14,47 +14,30 @@ GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see . %>