Merge branch 'master' into dev

helpers/sessionrefresh.js

@@ -4,7 +4,10 @@ const { Accounts } = require(__dirname+'/../db/')
 	, cache = require(__dirname+'/../redis.js');
 
 module.exports = async (req, res, next) => {
-	if (req.session && req.session.user && !res.locals.user) {
+	if (req.session && req.session.user) {
+		res.locals.user = await cache.get(`users:${req.session.user}`);
+
+		if (!res.locals.user) {
 			const account = await Accounts.findOne(req.session.user);
 			if (!account) {
 				req.session.destroy();
@@ -18,5 +21,6 @@ module.exports = async (req, res, next) => {
 				cache.set(`users:${req.session.user}`, res.locals.user, 3600);
 			}
 		}
+	}
 	next();
 }