From 6781b460f80fd46a3063ca11f64c16f10005d6b2 Mon Sep 17 00:00:00 2001 From: nitinseshadri <61258126+nitinseshadri@users.noreply.github.com> Date: Thu, 23 Jul 2020 05:30:50 +0000 Subject: [PATCH 1/9] Add public user profile pages --- adventure/userRoutes.js | 24 ++++++++++++++++++++++++ adventure/views/editProfile.ejs | 1 + adventure/views/head.ejs | 1 + adventure/views/publicProfile.ejs | 18 ++++++++++++++++++ adventure/views/saUser.ejs | 1 + 5 files changed, 45 insertions(+) create mode 100644 adventure/views/publicProfile.ejs diff --git a/adventure/userRoutes.js b/adventure/userRoutes.js index fb73275..980c8c3 100644 --- a/adventure/userRoutes.js +++ b/adventure/userRoutes.js @@ -114,6 +114,30 @@ server.get("/user/edit", restrictedRoute(), function (req, res) { return res.render("editProfile"); }); +server.get("/user/profile", restrictedRoute(), function (req, res) { + return res.redirect("/user/profile/" + req.user.ShortName); +}); + +server.get("/user/profile/:name", function (req, res) { + database.userByName(req.params.name, function (err, user) { + if (err) { + return res.status(500).render("error", { + message: "There was an error fetching from the database." + }); + } else if (user == null) { + return res.status(404).render("error", { + message: "There was no user." + }); + } else { + user.UserID = formatting.binToHex(user.UserID); + res.render("publicProfile", { + viewingUser: user, + userFlags: database.userFlags, + }); + } + }); +}); + server.post("/user/changepw", restrictedRoute(), urlencodedParser, function (req, res) { if (req.body && req.body.password && req.body.newPassword && req.body.newPasswordR) { formatting.checkPassword(req.body.password, req.user.Salt, req.user.Password, function(checkErr, success) { diff --git a/adventure/views/editProfile.ejs b/adventure/views/editProfile.ejs index fde4bf8..3bd6cbf 100644 --- a/adventure/views/editProfile.ejs +++ b/adventure/views/editProfile.ejs @@ -1,5 +1,6 @@ <%- include("head", {title: "Edit profile"}) %>

Edit profile

+View profile

Details

diff --git a/adventure/views/head.ejs b/adventure/views/head.ejs index d9169b0..867bb30 100644 --- a/adventure/views/head.ejs +++ b/adventure/views/head.ejs @@ -79,6 +79,7 @@ <%= user.ShortName %>
+ View profile Edit profile Log out
diff --git a/adventure/views/publicProfile.ejs b/adventure/views/publicProfile.ejs new file mode 100644 index 0000000..1a17458 --- /dev/null +++ b/adventure/views/publicProfile.ejs @@ -0,0 +1,18 @@ +<%- include("head", {title: viewingUser.ShortName + "\'s Profile"}) %> +

<%= viewingUser.ShortName %>

+

+<% if (viewingUser.UserFlags && viewingUser.UserFlags.length > 0) { %> +<% viewingUser.UserFlags.forEach(function (i, n, a) { %> +<%= i.LongName %> +<% }); %> +<% } %> +

+

Joined <%= viewingUser.RegistrationTime %>

+

Last Active <%= viewingUser.LastSeenTime %>

+<% if (config.usersCanChangeTheme) { %> +

Using Theme <%= viewingUser.ThemeName %>

+<% } %> +<% if (config.useVanilla) { %> +

Show profile on forum

+<% } %> +<%- include("foot") %> diff --git a/adventure/views/saUser.ejs b/adventure/views/saUser.ejs index ba291a9..26f4a3a 100644 --- a/adventure/views/saUser.ejs +++ b/adventure/views/saUser.ejs @@ -1,5 +1,6 @@ <%- include("head", {title: "Editing user " + editingUser.ShortName}) %>

Editing user <%= editingUser.ShortName %>

+View profile

Details

From 22b4bad01acece201e8beae8c38a86850587885e Mon Sep 17 00:00:00 2001 From: nitinseshadri <61258126+nitinseshadri@users.noreply.github.com> Date: Thu, 23 Jul 2020 13:40:49 -0400 Subject: [PATCH 2/9] Improved profile pages --- adventure/views/publicProfile.ejs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/adventure/views/publicProfile.ejs b/adventure/views/publicProfile.ejs index 1a17458..4ffa444 100644 --- a/adventure/views/publicProfile.ejs +++ b/adventure/views/publicProfile.ejs @@ -7,12 +7,18 @@ <% }); %> <% } %>

-

Joined <%= viewingUser.RegistrationTime %>

-

Last Active <%= viewingUser.LastSeenTime %>

-<% if (config.usersCanChangeTheme) { %> +

Joined <%= new Date(viewingUser.RegistrationTime).toLocaleDateString() %>

+

Last Active <%= new Date(viewingUser.LastSeenTime).toLocaleString() %>

+<% if (user && config.usersCanChangeTheme) { %>

Using Theme <%= viewingUser.ThemeName %>

<% } %> <% if (config.useVanilla) { %>

Show profile on forum

<% } %> +<% if (user && user.UserFlags.some(function (x) { return x.FlagName == "sa"; })) { %> +

Manage user

+<% } %> +<% if (user && user.ShortName == viewingUser.ShortName) { %> +

Edit profile

+<% } %> <%- include("foot") %> From d6e04d2985d495d6cdde8b059e23325fb87974e9 Mon Sep 17 00:00:00 2001 From: nitinseshadri <61258126+nitinseshadri@users.noreply.github.com> Date: Sat, 25 Jul 2020 23:10:58 -0400 Subject: [PATCH 3/9] View and reject contributions --- adventure/saContributionRoutes.js | 52 +++++++++++++- adventure/views/saContribution.ejs | 102 ++++++++++++++++++++++++++++ adventure/views/saContributions.ejs | 7 +- 3 files changed, 156 insertions(+), 5 deletions(-) create mode 100644 adventure/views/saContribution.ejs diff --git a/adventure/saContributionRoutes.js b/adventure/saContributionRoutes.js index 890c333..a1ef697 100644 --- a/adventure/saContributionRoutes.js +++ b/adventure/saContributionRoutes.js @@ -1,4 +1,4 @@ -var express = require("express"), +var express = require("express"), fs = require("fs"), path = require("path"), middleware = require("./middleware.js"), @@ -18,7 +18,7 @@ server.get("/sa/contributions", restrictedRoute("sa"), function (req, res) { var pages = Math.ceil(count / config.perPage); database.execute("SELECT * FROM `Contributions` WHERE `Status` = ? ORDER BY ContributionCreated DESC LIMIT ?,?", [status, (page - 1) * config.perPage, config.perPage], function (coErr, coRes, coFields) { var contributions = coRes.map(function (x) { - x.UserUUID = formatting.binToHex(x.ContributionUUID); + x.UserUUID = formatting.binToHex(x.UserUUID); x.ContributionUUID = formatting.binToHex(x.ContributionUUID); return x; }); @@ -32,6 +32,54 @@ server.get("/sa/contributions", restrictedRoute("sa"), function (req, res) { }); }); +server.get("/sa/contribution/:contribution", restrictedRoute("sa"), function (req, res) { + database.execute("SELECT * FROM `Contributions` WHERE `ContributionUUID` = ?", [formatting.hexToBin(req.params.contribution)], function (cErr, cRes, cFields) { + // now get any perphiery stuff + + var contribution = cRes[0] || null; + if (cErr || contribution == null) { + return res.status(404).render("error", { + message: "There is no contribution." + }); + } + + var contributions = cRes.map(function (x) { + x.UserUUID = formatting.binToHex(x.UserUUID); + x.ContributionUUID = formatting.binToHex(x.ContributionUUID); + return x; + }); + + return res.render("saContribution", { + contribution: contribution, + platformMappingsInverted: formatting.invertObject(config.constants.platformMappings) + }); + + }); +}); + +server.post("/sa/rejectContribution/:contribution", restrictedRoute("sa"), urlencodedParser, function (req, res) { + if (req.body && req.body.rejectionReason) { + var uuid = req.params.contribution; + var uuidAsBuf = formatting.hexToBin(uuid); + var status = "Rejected"; + var rejectionReason = req.body.rejectionReason; + database.execute("UPDATE `Contributions` SET `Status` = ?, `RejectionReason` = ? WHERE `ContributionUUID` = ?", [status, rejectionReason, uuidAsBuf], function (scErr, scRes, scFields) { + if (scErr) { + return res.status(500).render("error", { + message: "The contribution could not be rejected." + }); + } else { + return res.redirect("/sa/contributions"); + } + }); + } else { + return res.status(400).render("error", { + message: "The request was malformed." + }); + } +}); + + module.exports = function (c, d) { config = c database = d; diff --git a/adventure/views/saContribution.ejs b/adventure/views/saContribution.ejs new file mode 100644 index 0000000..5636583 --- /dev/null +++ b/adventure/views/saContribution.ejs @@ -0,0 +1,102 @@ +<%- include("head", {title: "Contribution: " + contribution.ProductTitle + " " + contribution.ReleaseTitle}) %> +

Contribution: <%= contribution.ProductTitle %> <%= contribution.ReleaseTitle %>

+

Basic metadata

+ +
+
+ + +
+
+ + +
+
+ <% + // HACK: datetime-local != toISOString + function pad(number) { + if (number < 10) { + return '0' + number; + } + return number; + } + function shortIso(d) { + return d.getUTCFullYear() + + '-' + pad(d.getUTCMonth() + 1) + + '-' + pad(d.getUTCDate()) + + 'T' + pad(d.getUTCHours()) + + ':' + pad(d.getUTCMinutes()); + } + %> +
+
+ + + + If your browser doesn't support HTML 5 datetime fields, use a format like 
2000-02-15T06:00
. + +
+
+ + + + If your browser doesn't support HTML 5 datetime fields, use a format like 
2000-02-15T06:00
. + +
+
+
+
+ + + + This field is formatted in Markdown + +
+
+ + + + This field is formatted in Markdown + +
+
+
+ + +
+
+
+ + +
+
+ + + + This field is converted to the most sensible human-readable byte size. Enter 0 to blank. + +
+
+ + + + This field is converted to the most sensible human-readable byte size. Enter 0 to blank. + +
+
+ + Cancel + +

Reject contribution

+
+
+ + +
+ +
+<%- include("foot") %> diff --git a/adventure/views/saContributions.ejs b/adventure/views/saContributions.ejs index 1a3c1f1..a437604 100644 --- a/adventure/views/saContributions.ejs +++ b/adventure/views/saContributions.ejs @@ -1,4 +1,5 @@ -<%- include("head", {title: "Contributions"}) %> +<%- include("head", {title: "Contributions"}) %> +

Contributions

@@ -11,11 +12,11 @@ <% (contributions || []).forEach(function(i, n, a) {%> <% }); %> From f4fae8c706b3b6900e25516ba9e45e04c73008f2 Mon Sep 17 00:00:00 2001 From: nitinseshadri <61258126+nitinseshadri@users.noreply.github.com> Date: Sat, 25 Jul 2020 23:34:42 -0400 Subject: [PATCH 4/9] Put in contribution UI --- adventure/libraryRoutes.js | 7 +++ adventure/views/contribute.ejs | 94 +++++++++++++++++++++++++++++ adventure/views/library.ejs | 1 + adventure/views/libraryOS.ejs | 1 + adventure/views/saContributions.ejs | 2 +- 5 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 adventure/views/contribute.ejs diff --git a/adventure/libraryRoutes.js b/adventure/libraryRoutes.js index 9021453..94d7025 100644 --- a/adventure/libraryRoutes.js +++ b/adventure/libraryRoutes.js @@ -122,6 +122,13 @@ function libraryRoute(req, res) { }); } } + +server.get("/library/contribute", restrictedRoute(), function (req, res) { + return res.render("contribute", { + platformMappingsInverted: formatting.invertObject(config.constants.platformMappings) + }); +}); + server.get("/library/:category", libraryRoute); server.get("/library/:category/:tag", libraryRoute); server.get("/library", function (req, res) { diff --git a/adventure/views/contribute.ejs b/adventure/views/contribute.ejs new file mode 100644 index 0000000..aea2182 --- /dev/null +++ b/adventure/views/contribute.ejs @@ -0,0 +1,94 @@ +<%- include("head", {title: "Contribute"}) %> +

Contribute

+

Basic metadata

+ +
+
+ + +
+
+ + +
+
+ <% + // HACK: datetime-local != toISOString + function pad(number) { + if (number < 10) { + return '0' + number; + } + return number; + } + function shortIso(d) { + return d.getUTCFullYear() + + '-' + pad(d.getUTCMonth() + 1) + + '-' + pad(d.getUTCDate()) + + 'T' + pad(d.getUTCHours()) + + ':' + pad(d.getUTCMinutes()); + } + %> +
+
+ + + + If your browser doesn't support HTML 5 datetime fields, use a format like 
2000-02-15T06:00
. + +
+
+ + + + If your browser doesn't support HTML 5 datetime fields, use a format like 
2000-02-15T06:00
. + +
+
+
+
+ + + + This field is formatted in Markdown + +
+
+ + + + This field is formatted in Markdown + +
+
+
+ + +
+
+
+ + +
+
+ + + + This field is converted to the most sensible human-readable byte size. Enter 0 to blank. + +
+
+ + + + This field is converted to the most sensible human-readable byte size. Enter 0 to blank. + +
+
+ + Cancel + +<%- include("foot") %> diff --git a/adventure/views/library.ejs b/adventure/views/library.ejs index 6f99350..ed9046c 100644 --- a/adventure/views/library.ejs +++ b/adventure/views/library.ejs @@ -3,6 +3,7 @@ <% for (var i in categoryMappings) { %> <%= categoryMappings[i] %> <% } %> + Contribute
<% products.forEach(function(i, n, a) {%> diff --git a/adventure/views/libraryOS.ejs b/adventure/views/libraryOS.ejs index 5a3b0ff..4c2ca11 100644 --- a/adventure/views/libraryOS.ejs +++ b/adventure/views/libraryOS.ejs @@ -3,6 +3,7 @@ <% for (var i in categoryMappings) { %> <%= categoryMappings[i] %> <% } %> + Contribute
diff --git a/adventure/views/saContributions.ejs b/adventure/views/saContributions.ejs index a437604..802f3e0 100644 --- a/adventure/views/saContributions.ejs +++ b/adventure/views/saContributions.ejs @@ -14,7 +14,7 @@
- + From 93dc1d4d2afcf6816cd3c7923a07968566bdfd99 Mon Sep 17 00:00:00 2001 From: nitinseshadri <61258126+nitinseshadri@users.noreply.github.com> Date: Sun, 26 Jul 2020 14:55:39 -0400 Subject: [PATCH 5/9] Let users view their contributions --- adventure/libraryRoutes.js | 21 ++++++++++ adventure/views/contribute.ejs | 8 +++- adventure/views/mycontributions.ejs | 63 +++++++++++++++++++++++++++++ adventure/views/saContribution.ejs | 8 +++- 4 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 adventure/views/mycontributions.ejs diff --git a/adventure/libraryRoutes.js b/adventure/libraryRoutes.js index 94d7025..0d98bb9 100644 --- a/adventure/libraryRoutes.js +++ b/adventure/libraryRoutes.js @@ -123,11 +123,32 @@ function libraryRoute(req, res) { } } +// These are first so that they aren't overridden by the category routes server.get("/library/contribute", restrictedRoute(), function (req, res) { return res.render("contribute", { platformMappingsInverted: formatting.invertObject(config.constants.platformMappings) }); }); +server.get("/library/my/contributions", restrictedRoute(), function (req, res) { + var page = req.query.page || 1; + var uuidAsBuf = req.user.UserID; + database.execute("SELECT COUNT(*) FROM `Contributions` WHERE `UserUUID` = ?", [uuidAsBuf] ,function (cErr, cRes, cFields) { + var count = cRes[0]["COUNT(*)"]; + var pages = Math.ceil(count / config.perPage); + database.execute("SELECT * FROM `Contributions` WHERE `UserUUID` = ? ORDER BY ContributionCreated DESC LIMIT ?,?", [uuidAsBuf, (page - 1) * config.perPage, config.perPage], function (coErr, coRes, coFields) { + var contributions = coRes.map(function (x) { + x.UserUUID = formatting.binToHex(x.UserUUID); + x.ContributionUUID = formatting.binToHex(x.ContributionUUID); + return x; + }); + return res.render("mycontributions", { + contributions: contributions, + page: page, + pages: pages + }); + }); + }); +}); server.get("/library/:category", libraryRoute); server.get("/library/:category/:tag", libraryRoute); diff --git a/adventure/views/contribute.ejs b/adventure/views/contribute.ejs index aea2182..ba73301 100644 --- a/adventure/views/contribute.ejs +++ b/adventure/views/contribute.ejs @@ -4,8 +4,12 @@
- - + + +
+
+ +
diff --git a/adventure/views/mycontributions.ejs b/adventure/views/mycontributions.ejs new file mode 100644 index 0000000..0f4020e --- /dev/null +++ b/adventure/views/mycontributions.ejs @@ -0,0 +1,63 @@ +<%- include("head", {title: "My contributions"}) %> +

My contributions

+
- <%= i.ReleaseTitle %> + <%= i.ProductTitle %> <%= i.ReleaseTitle %> <%= i.UserUUID %> - <%= i.Status %> (<%= i.ContributionCreated.toDateString() %>) + <%= i.Status %> (<%= i.Status == "Rejected" && i.RejectionReason ? i.RejectionReason : i.ContributionCreated.toDateString() %>)
<%= i.ProductTitle %> <%= i.ReleaseTitle %> <%= i.UserUUID %><%= i.UserUUID %> <%= i.Status %> (<%= i.Status == "Rejected" && i.RejectionReason ? i.RejectionReason : i.ContributionCreated.toDateString() %>)
+ + + + + + + + <% (contributions || []).forEach(function(i, n, a) {%> + + + + + <% }); %> + +
NameStatus
+ <%= i.ProductTitle %> <%= i.ReleaseTitle %> + + <%= i.Status %> (<%= i.Status == "Rejected" && i.RejectionReason ? i.RejectionReason : i.ContributionCreated.toDateString() %>) +
+ +<%- include("foot") %> \ No newline at end of file diff --git a/adventure/views/saContribution.ejs b/adventure/views/saContribution.ejs index 5636583..3b87de9 100644 --- a/adventure/views/saContribution.ejs +++ b/adventure/views/saContribution.ejs @@ -4,8 +4,12 @@
- - + + +
+
+ +
From 97286d1d8bbccdc8d926f02d8c0c0a6d064aa595 Mon Sep 17 00:00:00 2001 From: nitinseshadri <61258126+nitinseshadri@users.noreply.github.com> Date: Sun, 26 Jul 2020 15:19:11 -0400 Subject: [PATCH 6/9] Add config switch for contributions --- adventure/config.example.json | 1 + adventure/libraryRoutes.js | 5 +++++ adventure/views/head.ejs | 1 + adventure/views/library.ejs | 2 ++ adventure/views/libraryOS.ejs | 2 ++ 5 files changed, 11 insertions(+) diff --git a/adventure/config.example.json b/adventure/config.example.json index e8ff8f4..6722805 100644 --- a/adventure/config.example.json +++ b/adventure/config.example.json @@ -32,6 +32,7 @@ "viewDirectory": "views", "resDirectory": "res", "usersCanChangeTheme": true, + "allowContributions": true, "constants": { "tagMappings": { diff --git a/adventure/libraryRoutes.js b/adventure/libraryRoutes.js index 0d98bb9..c7c7037 100644 --- a/adventure/libraryRoutes.js +++ b/adventure/libraryRoutes.js @@ -125,6 +125,11 @@ function libraryRoute(req, res) { // These are first so that they aren't overridden by the category routes server.get("/library/contribute", restrictedRoute(), function (req, res) { + if (!config.allowContributions) { // If allowContributions is FALSE + return res.status(500).render("error", { + message: "Contributions aren't being accepted at this time." + }); + } return res.render("contribute", { platformMappingsInverted: formatting.invertObject(config.constants.platformMappings) }); diff --git a/adventure/views/head.ejs b/adventure/views/head.ejs index 867bb30..a9e767e 100644 --- a/adventure/views/head.ejs +++ b/adventure/views/head.ejs @@ -79,6 +79,7 @@ <%= user.ShortName %>
+ My contributions View profile Edit profile Log out diff --git a/adventure/views/library.ejs b/adventure/views/library.ejs index ed9046c..ada9e1b 100644 --- a/adventure/views/library.ejs +++ b/adventure/views/library.ejs @@ -3,7 +3,9 @@ <% for (var i in categoryMappings) { %> <%= categoryMappings[i] %> <% } %> + <% if (config.allowContributions) { %> Contribute + <% } %>
<% products.forEach(function(i, n, a) {%> diff --git a/adventure/views/libraryOS.ejs b/adventure/views/libraryOS.ejs index 4c2ca11..580c0e3 100644 --- a/adventure/views/libraryOS.ejs +++ b/adventure/views/libraryOS.ejs @@ -3,7 +3,9 @@ <% for (var i in categoryMappings) { %> <%= categoryMappings[i] %> <% } %> + <% if (config.allowContributions) { %> Contribute + <% } %>
From dfa557d874a38ecc82bcc9bfadd54e5da0adf3d2 Mon Sep 17 00:00:00 2001 From: nitinseshadri <61258126+nitinseshadri@users.noreply.github.com> Date: Sun, 26 Jul 2020 15:24:31 -0400 Subject: [PATCH 7/9] Add hints to contribution page --- adventure/views/contribute.ejs | 6 ++++++ adventure/views/saContribution.ejs | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/adventure/views/contribute.ejs b/adventure/views/contribute.ejs index ba73301..c0ef9b0 100644 --- a/adventure/views/contribute.ejs +++ b/adventure/views/contribute.ejs @@ -6,10 +6,16 @@
+ + e.g. Windows 95 +
+ + e.g. OSR2 +
diff --git a/adventure/views/saContribution.ejs b/adventure/views/saContribution.ejs index 3b87de9..32f0b9d 100644 --- a/adventure/views/saContribution.ejs +++ b/adventure/views/saContribution.ejs @@ -6,10 +6,16 @@
+ + e.g. Windows 95 +
+ + e.g. OSR2 +
From a71ed4c1867a8db9a47dde4db4e246368ee0b834 Mon Sep 17 00:00:00 2001 From: nitinseshadri <61258126+nitinseshadri@users.noreply.github.com> Date: Sun, 26 Jul 2020 15:34:00 -0400 Subject: [PATCH 8/9] Update ProcessTime and ProcessBy when rejecting --- adventure/saContributionRoutes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/adventure/saContributionRoutes.js b/adventure/saContributionRoutes.js index a1ef697..9bd29ae 100644 --- a/adventure/saContributionRoutes.js +++ b/adventure/saContributionRoutes.js @@ -63,7 +63,8 @@ server.post("/sa/rejectContribution/:contribution", restrictedRoute("sa"), urlen var uuidAsBuf = formatting.hexToBin(uuid); var status = "Rejected"; var rejectionReason = req.body.rejectionReason; - database.execute("UPDATE `Contributions` SET `Status` = ?, `RejectionReason` = ? WHERE `ContributionUUID` = ?", [status, rejectionReason, uuidAsBuf], function (scErr, scRes, scFields) { + var userIdAsBuf = req.user.UserID; + database.execute("UPDATE `Contributions` SET `Status` = ?, `RejectionReason` = ?, ProcessTime = NOW(), ProcessBy = ? WHERE `ContributionUUID` = ?", [status, rejectionReason, userIdAsBuf, uuidAsBuf], function (scErr, scRes, scFields) { if (scErr) { return res.status(500).render("error", { message: "The contribution could not be rejected." From 4396ebb26e088d0f7dc80417e0e8632cb42fe8dc Mon Sep 17 00:00:00 2001 From: nitinseshadri <61258126+nitinseshadri@users.noreply.github.com> Date: Thu, 30 Jul 2020 12:55:04 -0400 Subject: [PATCH 9/9] Also support user profiles by ID --- adventure/userRoutes.js | 14 ++++++++++++-- adventure/views/saContributions.ejs | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/adventure/userRoutes.js b/adventure/userRoutes.js index 980c8c3..619f76b 100644 --- a/adventure/userRoutes.js +++ b/adventure/userRoutes.js @@ -125,8 +125,18 @@ server.get("/user/profile/:name", function (req, res) { message: "There was an error fetching from the database." }); } else if (user == null) { - return res.status(404).render("error", { - message: "There was no user." + database.userById(formatting.hexToBin(req.params.name), function (err, user) { + if (err) { + return res.status(500).render("error", { + message: "There was an error fetching from the database." + }); + } else if (user == null) { + return res.status(404).render("error", { + message: "There was no user." + }); + } else { + return res.redirect("/user/profile/" + user.ShortName); + } }); } else { user.UserID = formatting.binToHex(user.UserID); diff --git a/adventure/views/saContributions.ejs b/adventure/views/saContributions.ejs index 802f3e0..c58ca66 100644 --- a/adventure/views/saContributions.ejs +++ b/adventure/views/saContributions.ejs @@ -14,7 +14,7 @@ <%= i.ProductTitle %> <%= i.ReleaseTitle %> - <%= i.UserUUID %> + <%= i.UserUUID %> <%= i.Status %> (<%= i.Status == "Rejected" && i.RejectionReason ? i.RejectionReason : i.ContributionCreated.toDateString() %>)