diff --git a/src/middleware/detectVersion.js b/src/middleware/detectVersion.js index f6afa1a..997e603 100644 --- a/src/middleware/detectVersion.js +++ b/src/middleware/detectVersion.js @@ -2,7 +2,7 @@ const util = require('../util'); async function detectVersion(request, response, next) { request.timerDate = Date.now(); - //console.time(`Time Request ${request.timerDate}`); + console.time(`Time Request ${request.timerDate}`); // Check the domain and set the directory if (includes(request, 'juxt')) { request.directory = 'web'; diff --git a/src/middleware/webAuth.js b/src/middleware/webAuth.js index b60759c..3bd5158 100644 --- a/src/middleware/webAuth.js +++ b/src/middleware/webAuth.js @@ -4,6 +4,7 @@ const util = require('../util'); async function webAuth(request, response, next) { // Get pid and fetch user data + console.time(`Time Request for token ${request.timerDate}`); try { request.user = await util.getUserDataFromToken(request.cookies.access_token); request.pid = request.user.pid; @@ -19,6 +20,8 @@ async function webAuth(request, response, next) { return next(); } } + console.timeEnd(`Time Request for token ${request.timerDate}`); + console.timeEnd(`Time Request ${request.timerDate}`); request.token = request.cookies.access_token; diff --git a/src/util.js b/src/util.js index 82bf5fb..53f2b42 100644 --- a/src/util.js +++ b/src/util.js @@ -62,7 +62,7 @@ function nameCache() { if (users !== null) { for (let i = 0; i < users.length; i++ ) { if (users[i].pid !== null) { - userMap.set(users[i].pid, users[i].screen_name.replace(/[\u{0080}-\u{FFFF}]/gu,'')); + userMap.set(users[i].pid, users[i].screen_name.replace(/[\u{0080}-\u{FFFF}]/gu,'').replace(/\u202e/g, '')); } } logger.success('Created user index of ' + users.length + ' users'); @@ -223,7 +223,7 @@ function setName(pid, name) { return; } userMap.delete(pid); - userMap.set(pid, name); + userMap.set(pid, name.replace(/[\u{0080}-\u{FFFF}]/gu,'').replace(/\u202e/g, '')); } function resizeImage(file, width, height) { sharp(file) @@ -315,8 +315,8 @@ async function newNotification(notification) { existingNotification.read = false; return await existingNotification.save(); } - const last10min = new Date(now.getTime() - 10 * 60 * 1000); - existingNotification = await NOTIFICATION.findOne({ pid: notification.pid, type: 'follow', lastUpdated: { $gte: last10min } }); + const last60min = new Date(now.getTime() - 60 * 60 * 1000); + existingNotification = await NOTIFICATION.findOne({ pid: notification.pid, type: 'follow', lastUpdated: { $gte: last60min } }); if (existingNotification) { existingNotification.users.push({ user: notification.objectID, diff --git a/src/webfiles/web/partials/head.ejs b/src/webfiles/web/partials/head.ejs index f61d3aa..2bc46a7 100644 --- a/src/webfiles/web/partials/head.ejs +++ b/src/webfiles/web/partials/head.ejs @@ -3,6 +3,7 @@ +