diff --git a/package.json b/package.json index d01d5aa..e0c23a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "canopy-of-indev", "version": "0.4.3", + "canopyDisplayVersion": "0.4-Indev Hotfix 3", "license": "AGPL-3.0-only", "dependencies": { "@braintree/sanitize-url": "^7.1.1", diff --git a/src/controllers/aboutController.js b/src/controllers/aboutController.js index 2b32b84..187157b 100644 --- a/src/controllers/aboutController.js +++ b/src/controllers/aboutController.js @@ -16,6 +16,7 @@ along with this program. If not, see .*/ //Config const config = require('../../config.json'); +const package = require('../../package.json'); //Local Imports const csrfUtils = require('../utils/csrfUtils'); @@ -23,5 +24,5 @@ const csrfUtils = require('../utils/csrfUtils'); //register page functions module.exports.get = async function(req, res){ //Render page - return res.render('about', {aboutText: config.aboutText, instance: config.instanceName, user: req.session.user, csrfToken: csrfUtils.generateToken(req)}); + return res.render('about', {aboutText: config.aboutText, instance: config.instanceName, user: req.session.user, version: package.canopyDisplayVersion, csrfToken: csrfUtils.generateToken(req)}); } \ No newline at end of file diff --git a/src/server.js b/src/server.js index 50dcda0..f783a6d 100644 --- a/src/server.js +++ b/src/server.js @@ -75,6 +75,7 @@ const apiRouter = require('./routers/apiRouter'); //Define Config variables const config = require('../config.json'); +const package = require('../package.json'); const port = config.port; const dbUrl = `mongodb://${config.db.user}:${config.db.pass}@${config.db.address}:${config.db.port}/${config.db.database}`; @@ -208,7 +209,7 @@ Might be better if she kicked off everything at once, and ran a while loop to ch This runs once at server startup, and most startups will run fairly quickly so... Not worth it?*/ async function asyncKickStart(){ //Lettum fuckin' know wassup - console.log(`${config.instanceName}(Powered by Canopy) is booting up!`); + console.log(`${config.instanceName}(Powered by Canopy ${package.canopyDisplayVersion}) is booting up!`); //Run legacy migration await migrationModel.ingestLegacyDump(); diff --git a/src/views/about.ejs b/src/views/about.ejs index 8842ff0..cebfc35 100644 --- a/src/views/about.ejs +++ b/src/views/about.ejs @@ -40,6 +40,8 @@ along with this program. If not, see . %> it was decided that the original cytube fork, fore.st, had been run past it's prime. In summer/fall 2024, work began on a replacement. The resulting software became Canopy, which was first used to run the ourfore.st instance in late 2025.

+
+

Canopy Ver: <%= version %>