Leahnaya/juxtaposition-ui
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/juxtaposition-ui.git synced 2026-09-12 03:15:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed usernames being able to flip notifications backwards

Browse Source
This commit is contained in:
Jemma
2024-04-18 20:47:32 -05:00
parent ecf5828f0d
commit b5da8169db
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/middleware/detectVersion.js
View File

@@ -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';

3
src/middleware/webAuth.js
View File

@@ -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;

8
src/util.js
View File

@@ -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,

1
src/webfiles/web/partials/head.ejs
View File

@@ -3,6 +3,7 @@
<script src="/js/pjax.min.js"></script>
<script src="/js/web.min.js"></script>
<link rel="manifest" href="https://juxt-web-cdn.b-cdn.net/web/manifest.json">
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;700&amp;display=swap" rel="stylesheet">
<!-- Global site tag (gtag.js) - Google Analytics Testing-->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-195842548-1"></script>
<script>