Achievements [WIP]

.gitignore

@@ -10,6 +10,7 @@ views/legit.*
 config/community_guidelines.md
 config/privacy_policy.md
 config/tos.md
+config/achievements.js
 modules/*
 
 ### Linux ###

app.js

@@ -1,6 +1,8 @@
 const mongoose = require("mongoose");
 mongoose.promise = global.Promise;
 const recaptcha = require("express-recaptcha");
+const readline = require("readline").createInterface({input: process.stdin, output: process.stdout});
+const util = require("util");
 const PaintingManager = require("./util/PaintingManager");
 const HTTPServer = require("./util/HTTPServer");
 const WebsocketServer = require("./util/WebsocketServer");
@@ -97,7 +99,8 @@ app.recreateServer = () => {
 }
 app.recreateServer();
 
-mongoose.connect(app.config.database);
+mongoose.connect(app.config.database, {useMongoClient: true});
+mongoose.Promise = global.Promise;
 
 // Process JS
 app.javascriptProcessor = new JavaScriptProcessor(app);
@@ -129,4 +132,22 @@ app.recreateRoutes = () => {
         manager.getAllPublicDirectoriesToRegister().then((directories) => continueWithServer(directories)).catch((err) => continueWithServer());
     });
 }
-app.recreateRoutes();
+app.recreateRoutes();
+readline.on('line', i => {
+    try {
+        var output = eval(i)
+        output instanceof Promise
+        ? output.then(a => {
+            console.log('Promise Resolved')
+            console.log(util.inspect(a, {depth: 0}))
+        }).catch(e => {
+            console.log('Promise Rejected')
+            console.log(e.stack)
+        })
+        : output instanceof Object
+            ? console.log(util.inspect(output, {depth: 0}))
+            : console.log(output)
+    } catch (err) {
+        console.log(err.stack)
+    }
+})

client/js/place.js

@@ -8,6 +8,7 @@ var size;
 
 var SignInDialogController = DialogController($("#sign-in-dialog"));
 var ChangelogDialogController = DialogController($("#changelog-dialog"));
+var HelpDialogController = DialogController($("#help-dialog"));
 var BetaDialogController = DialogController($("#beta-dialog"));
 BetaDialogController.dialog.find("#signup").click(function() {
     placeAjax.post("/api/beta-signup", null, null).then(data => {
@@ -107,7 +108,7 @@ var notificationHandler = {
             let notif = new Notification(title, {
                 body: message
             });
-            notif.addEventListener('click', () => {
+            notif.addEventListener('click', (e) => {
                 // focus on window
                 parent.focus();
                 window.focus(); // fallback
@@ -148,7 +149,7 @@ var place = {
     notificationHandler: notificationHandler, hashHandler: hashHandler,
     messages: null,
     isOutdated: false, lastPixelUpdate: null,
-    colours: null, canPlaceCustomColours: false, hasTriedToFetchAvailability: false, customColour: null,
+    colours: null, pixelFlags: null, canPlaceCustomColours: false, hasTriedToFetchAvailability: false, customColour: null,
     cursorX: 0, cursorY: 0,
     templatesEnabled: false,
 
@@ -284,6 +285,7 @@ var place = {
         placeAjax.get("/api/feature-availability", null, null).then((data) => {
             this.hasTriedToFetchAvailability = true;
             this.colours = data.availability.colours;
+            this.pixelFlags = data.availability.flags;
             this.canPlaceCustomColours = data.availability.user && data.availability.user.canPlaceCustomColours;
             this.templatesEnabled = data.availability.user && data.availability.user.hasTemplatesExperiment
             this.layoutTemplates();
@@ -523,6 +525,16 @@ var place = {
                 this.colourPaletteOptionElements.push(elem[0]);
             });
             this.updateColourSelectorPosition();
+            if(this.pixelFlags && this.pixelFlags.length > 0) {
+                $("<div>").addClass("palette-separator").appendTo(contentContainer);
+                this.pixelFlags.forEach((flag, index) => {
+                    var elem = $("<div>").addClass("colour-option flag-option").css("background-image", `url(${flag.image})`).attr("data-flag", index).attr("data-flag-id", flag.id).attr("title", `${flag.title}:\n${flag.description}`).attr("alt", flag.title);
+                    if(flag.needsBorder) elem.addClass("is-white");
+                    elem.appendTo(contentContainer);
+                    this.colourPaletteOptionElements.push(elem[0]);
+                    console.log(flag);
+                });
+            }
         } else {
             overlay.text(this.hasTriedToFetchAvailability ? "An error occurred while loading colours. Retrying…" : "Loading…").show();
         }
@@ -1062,6 +1074,7 @@ var place = {
     },
 
     pickColourUnderCursor: function() {
+        if(!this.canPlaceCustomColours) return;
         var cursor = this.getCanvasCursorPosition();
         var colour = this.canvasController.getPixelColour(cursor.x, cursor.y);
         $("#colour-picker").minicolors("value", "#" + colour);
@@ -1416,4 +1429,13 @@ if(place.isSignedIn()) {
     $(document).ready(function() {
         changelogController.getChangelogsForShow();
     });
-}
+}
+
+$(document).ready(function() {
+    if(hashHandler.getHash()["beta"] != null) {
+        hashHandler.deleteHashKey("beta");
+        BetaDialogController.show();
+    }
+});
+
+$("#nav-help > a").click(() => HelpDialogController.show());

client/js/site.js

@@ -77,7 +77,7 @@ function DialogController(dialog) {
                 e.preventDefault();
                 var form = $(this);
                 var call = form.attr("action");
-                var tab = form.parent().attr("tab-name");
+                var tab = form.parent().parent().attr("tab-name");
                 var data = form.serialize();
                 if(form.data("submitting")) return;
                 var submitButton = form.find("input[type=submit], button[type=submit]");
@@ -105,7 +105,7 @@ function DialogController(dialog) {
                         me.switchTab("2fa-auth");
                         return;
                     }
-                    if(tab == "sign-up") grecaptcha.reset();
+                    if(tab == "sign-up" && typeof grecaptcha != "undefined") grecaptcha.reset();
                     me.shake();
                     var error = "An unknown error occurred while attempting to authenticate you.";
                     if(err && err.message) error = err.message;
@@ -247,10 +247,3 @@ if(("standalone" in window.navigator) && window.navigator.standalone){
 
 	}, false);
 }
-
-$(document).ready(function() {
-    if(hashHandler.getHash()["beta"] != null) {
-        hashHandler.deleteHashKey("beta");
-        BetaDialogController.show();
-    }
-});

config/achievements.js

@@ -0,0 +1,126 @@
+const olderThan = (date = Date.now(), time = {milliseconds: 0, seconds: 0, minutes: 0, hours: 0, days: 0, weeks: 0, months: 0, years: 0}) => {
+    let computedTime = Date.now();
+    if (time.milliseconds) {
+        computedTime -= time.milliseconds;
+    }
+    if (time.seconds) {
+        computedTime -= time.seconds * 1000;
+    }
+    if (time.minutes) {
+        computedTime -= time.minutes * 1000 * 60;
+    }
+    if (time.hours) {
+        computedTime -= time.hours * 1000 * 60 * 60;
+    }
+    if (time.days) {
+        computedTime -= time.days * 1000 * 60 * 60 * 24;
+    }
+    if (time.weeks) {
+        computedTime -= time.weeks * 1000 * 60 * 60 * 24 * 7;
+    }
+    if (time.months) {
+        let cTime = new Date();
+        cTime.setTime(Date.now() - computedTime);
+        const newMonths = cTime.getMonth() + time.months;
+        cTime.setMonth(newMonths);
+        computedTime = cTime.getTime();
+    }
+    if (time.years) {
+        computedTime -= time.years * 1000 * 60 * 60 * 24 * 365;
+    }
+    console.log("Minimum: " + computedTime);
+    console.log("Date: " + date);
+    return computedTime > date;
+};
+
+module.exports = [
+    // User has placed at least five pixels
+    {
+        name: "First Pixel!",
+        description: "You've placed one pixel!",
+        imageURL: null,
+        meetsCriteria(user) {
+            return user.placeCount >= 1;
+        }
+    },
+    {
+        name: "Ten Pixels!",
+        description: "Congrats on hitting ten pixels! Keep it going!",
+        imageURL: null,
+        meetsCriteria(user) {
+            return user.placeCount >= 10;
+        }
+    },
+    {
+        name: "100 Pixels!",
+        description: "W00T! Let's go let's go let's go!!! Get to 1000 pixels!",
+        imageURL: null,
+        meetsCriteria(user) {
+            return user.placeCount >= 100;
+        }
+    },
+    {
+        name: "1000 Pixels!",
+        description: "I see you, placing those pixels all sexy 'n shit.",
+        imageURL: null,
+        meetsCriteria(user) {
+            return user.placeCount >= 1000;
+        }
+    },
+    {
+        name: "Addict",
+        description: "People can safely default to assuming you're on canvas.place",
+        imageURL: null,
+        meetsCriteria(user) {
+            return user.placeCount >= 10000;
+        }
+    },
+    {
+        name: "Ultra-Addict",
+        description: "You play canvas.place so much, you should just run the website.",
+        imageURL: null,
+        meetsCriteria(user) {
+            return user.placeCount >= 50000;
+        }
+    },
+    {
+        name: "Beginner",
+        description: "You're just starting out, but don't fret. You're going great places.",
+        imageURL: null,
+        meetsCriteria(user) {
+            return olderThan(user.creationDate, {days: 1});
+        }
+    },
+    {
+        name: "Novice",
+        description: "You're wiser than the average fellow but have much left to learn.",
+        imageURL: null,
+        meetsCriteria(user) {
+            return olderThan(user.creationDate, {weeks: 1});
+        }
+    },
+    {
+        name: "Intermediate",
+        description: "You're getting the hang of it! Keep at it.",
+        imageURL: null,
+        meetsCriteria(user) {
+            return olderThan(user.creationDate, {months: 1});
+        }
+    },
+    {
+        name: "Advanced",
+        description: "You've got it! I consider you to be proficient at the art of placing.",
+        imageURL: null,
+        meetsCriteria(user) {
+            return olderThan(user.creationDate, {months: 6});
+        }
+    },
+    {
+        name: "Expert",
+        description: "You're better than me, so..",
+        imageURL: null,
+        meetsCriteria(user) {
+            return olderThan(user.creationDate, {years: 1});
+        }
+    }
+];

config/config.example.js

@@ -11,9 +11,14 @@ module.exports = {
     "placeTimeout": 60,
     'enableChangelogs': true,
     'siteName': 'Place',
-    //"raven": "", 
-    //"publicRaven": "", 
+    // "raven": "", 
+    // "publicRaven": "", 
     // "bugsnag": "",
+    'maintenance': {
+        'allowSignups': true, 
+        'allowLogins': true,
+        'notice': undefined
+    },
     "cachet": {
         // Setup reporting error count as a metric to Cachet
         "apiKey": "",
@@ -62,5 +67,6 @@ module.exports = {
             "clientID": "",
             "clientSecret": ""
         }
-    }
+    },
+    "pixelFlags": []
 };

controllers/AccountPageController.js

@@ -14,8 +14,13 @@ exports.getAccount = (req, res, next) => {
     User.findByUsername(req.params.username).then((user) => {
         if(!user) return next();
         if((user.banned || user.deactivated) && !(req.user.moderator || req.user.admin)) return next();
-        user.getInfo(req.place).then((info) => {
-            return req.responseFactory.sendRenderedResponse("public/account", { profileUser: user, profileUserInfo: info, hasNewPassword: req.query.hasNewPassword });
+        user.getInfo(req.place).then(async (info) => {
+            if (req.user.admin) {
+                const accessData = await user.getUniqueIPsAndUserAgents();
+                user.ipAddresses = accessData.ipAddresses;
+                user.userAgents = accessData.userAgents;
+            }
+            return req.responseFactory.sendRenderedResponse("public/account", { profileUser: user, profileUserInfo: info, hasNewPassword: req.query.hasNewPassword});
         }).catch((err) => next());
     }).catch((err) => next());
 };

controllers/AchievementsController.js

@@ -0,0 +1,19 @@
+const User = require("../models/user");
+
+const handleBadRequest = (res, e) => {
+    console.error(e);
+    res.status(500).json({success: false, error: {message: "An error occurred while processing your request"}});
+}
+
+exports.getUserAchievements = (req, res, next) => {
+    if (!req.params.username) return res.status(400).json({success: false, error: {code: "bad_request", message: "The username parameter is rqeuired."}});
+    const name = req.params.username;
+    User.findByUsername(name).then(user => {
+        if (!user) {
+            return res.status(404).json({success: false, error: {code: "not_found", message: "The username provided does not match any registered users."}});
+        }
+        user.getAchievements().then(achievements => {
+            res.json({achievements, success: true});
+        }).catch((e) => handleBadRequest(res, e));
+    }).catch((e) => handleBadRequest(res, e));
+}

controllers/AuthController.js

@@ -4,17 +4,26 @@ const passport = require("passport");
 const speakeasy = require("speakeasy");
 const absoluteURLRegex = new RegExp('^(?:[a-z]+:)?(//)?', 'i');
 
+const User = require('../models/user');
+
 exports.postSignIn = (req, res, next) => {
+    const config = req.place.config;
     require("../util/passport")(passport, req.place);
     if (req.user) return res.redirect("/");
     if (!req.body.username || !req.body.password) return res.status(400).json({success: false, error: {message: "A username and password are required."}});
     passport.authenticate("local", function(err, user, info) {
         if (!user) return res.status(403).json({success: false, error: info.error || {message: "A username and password are required."}});
+        if (!user.admin && config.maintenance && !config.maintenance.allowLogins) return res.status(403).json({
+            success: false,
+            error: {
+                message: 'Logins disabled. Please do not call this endpoint any futher.'
+            }
+        });
         if (user.twoFactorAuthEnabled()) {
             if(!req.body.totpToken) return res.status(403).json({success: false, error: {code: "totp_needed", message: "Two-factor authentication is enabled for this account. Please specify your two-factor authentication token."}});
             if(!speakeasy.totp.verify({ secret: user.totpSecret, encoding: 'base32', token: req.body.totpToken, window: 6 })) return res.status(403).json({success: false, error: {code: "invalid_totp", message: "We couldn't sign you in with that two-factor authentication token. Make sure you're entering the right code and it is updated."}});
         }
-        if(!!req.body.keepSignedIn) req.session.maxAge = 1000 * 60 * 60 * 24 * 7; // keep signed in for 7 days
+        if(req.body.keepSignedIn) req.session.maxAge = 1000 * 60 * 60 * 24 * 7; // keep signed in for 7 days
         req.login(user, function(err) {
             if (err) return res.status(500).json({success: true, error: {message: "An unknown error occurred."}});
             return res.json({success: true});
@@ -23,6 +32,13 @@ exports.postSignIn = (req, res, next) => {
 };
 
 exports.postSignUp = (req, res, next) => {
+    const config = req.place.config;
+    if (config.maintenance && !config.maintenance.allowSignups) return res.status(403).json({
+        success: false,
+        error: {
+            message: 'Signups disabled. Please do not call this endpoint any futher.'
+        }
+    });
     function sendError(error) {
         res.json({success: false, error: error || {message: "An unknown error occurred", code: "unknown_error"}});
     }
@@ -32,7 +48,7 @@ exports.postSignUp = (req, res, next) => {
     function doSignup() {
         User.register(req.body.username, req.body.password, req.place, function(user, error) {
             if(!user) return sendError(error);
-            if(!!req.body.keepSignedIn) req.session.maxAge = 1000 * 60 * 60 * 24 * 7; // keep signed in for 7 days
+            if(req.body.keepSignedIn) req.session.maxAge = 1000 * 60 * 60 * 24 * 7; // keep signed in for 7 days
             req.login(user, function(err) {
                 if (err) return sendError(null);
                 res.json({success: true});