diff --git a/frontend/js/user/profile-controller.js b/frontend/js/user/profile-controller.js
index 8f229e4f..5b2e63bc 100644
--- a/frontend/js/user/profile-controller.js
+++ b/frontend/js/user/profile-controller.js
@@ -4,19 +4,14 @@ import { loadGoalSetter } from "./goal-setter.js";
import { fetchUserData } from "./historical-graphs.js";
import { loadLeaderboardRanks } from "./ranks.js";
import { loadStreakData } from "./streak.js";
-
-function getUsername() {
- const pathSegments = window.location.pathname.split("/");
- return (
- pathSegments[pathSegments.length - 1] ||
- pathSegments[pathSegments.length - 2] ||
- ""
- );
-}
+import { getCurrentUsername } from "./utils.js";
async function initProfile() {
- const username = getUsername();
- if (!username) return;
+ const username = getCurrentUsername();
+ if (!username) {
+ console.error("Critical error: Username meta tag is missing.");
+ return;
+ }
// Set header display variables prior to fetch if elements exist
const usernameHeading = document.getElementById("username-display");
diff --git a/frontend/js/user/utils.js b/frontend/js/user/utils.js
new file mode 100644
index 00000000..1fe4b7ac
--- /dev/null
+++ b/frontend/js/user/utils.js
@@ -0,0 +1,10 @@
+export function getCurrentUsername() {
+ const metaTag = document.querySelector('meta[name="current-user"]');
+
+ if (!metaTag || !metaTag.content) {
+ console.warn("Current user meta tag is missing or empty.");
+ return null;
+ }
+
+ return metaTag.content.trim();
+}
diff --git a/frontend/user.html b/frontend/user.html
index fa8d49b9..dd642ceb 100644
--- a/frontend/user.html
+++ b/frontend/user.html
@@ -2,6 +2,7 @@
+
CodePVG
diff --git a/server.js b/server.js
index 302324fa..4e5f6996 100644
--- a/server.js
+++ b/server.js
@@ -80,20 +80,26 @@ app.use((req, res, next) => {
// 4. HTML page routes — inject per-request nonce into __NONCE__ placeholders
const htmlCache = {};
-function serveHtml(res, filePath) {
- if (htmlCache[filePath]) {
- const html = htmlCache[filePath].replace(/__NONCE__/g, res.locals.nonce);
- return res.type("html").send(html);
- }
-
- fs.readFile(filePath, "utf8", (err, data) => {
- if (err) {
+function serveHtml(res, filePath, replacements = {}) {
+ let template = htmlCache[filePath];
+
+ if (!template) {
+ try {
+ template = fs.readFileSync(filePath, "utf8");
+ htmlCache[filePath] = template;
+ } catch (err) {
return res.status(500).send("Error loading page");
}
- htmlCache[filePath] = data;
- const html = data.replace(/__NONCE__/g, res.locals.nonce);
- res.type("html").send(html);
- });
+ }
+
+ let html = template.replace(/__NONCE__/g, res.locals.nonce);
+
+ for (const [key, value] of Object.entries(replacements)) {
+ const regex = new RegExp(key, "g");
+ html = html.replace(regex, value);
+ }
+
+ res.type("html").send(html);
}
/* HOME ROUTES */
@@ -133,7 +139,10 @@ app.get("/uptime", (req, res) => {
});
app.get("/user/:username", (req, res) => {
- serveHtml(res, path.join(__dirname, "frontend", "user.html"));
+ const username = req.params.username;
+ serveHtml(res, path.join(__dirname, "frontend", "user.html"), {
+ __USERNAME__: username,
+ });
});
// ---- Rate limiter for API endpoint ----