From 9d74539a4e6dcf7e3e11901ea0355c4d17ee44fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 6 Jun 2024 11:34:57 -0400 Subject: [PATCH 1/3] fix: set uid in case its spider(-1), closes #12621 --- src/user/data.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/user/data.js b/src/user/data.js index c7e2d8b828..36800454d3 100644 --- a/src/user/data.js +++ b/src/user/data.js @@ -120,6 +120,7 @@ module.exports = function (User) { user.username = (user.hasOwnProperty('oldUid') && parseInt(user.oldUid, 10)) ? '[[global:former-user]]' : '[[global:guest]]'; user.displayname = user.username; } + user.uid = uid; return user; }); From ca4a7751e2839d8de0b7ccded0a6a165278349fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 6 Jun 2024 12:14:08 -0400 Subject: [PATCH 2/3] fix: dont load chat rooms for quests/spiders --- src/middleware/render.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/middleware/render.js b/src/middleware/render.js index 78d3577418..4ae47a4161 100644 --- a/src/middleware/render.js +++ b/src/middleware/render.js @@ -130,7 +130,7 @@ module.exports = function (middleware) { return await user.getUserData(req.uid); } return { - uid: 0, + uid: req.uid === -1 ? -1 : 0, username: '[[global:guest]]', picture: user.getDefaultAvatar(), 'icon:text': '?', @@ -184,7 +184,7 @@ module.exports = function (middleware) { timeagoCode: languages.userTimeagoCode(res.locals.config.userLang), browserTitle: translator.translate(controllersHelpers.buildTitle(title)), navigation: navigation.get(req.uid), - roomIds: db.getSortedSetRevRange(`uid:${req.uid}:chat:rooms`, 0, 0), + roomIds: req.uid > 0 ? db.getSortedSetRevRange(`uid:${req.uid}:chat:rooms`, 0, 0) : [], }); const unreadData = { From 7c2a3a6e13326736622b65958691dc01171941d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 6 Jun 2024 13:17:22 -0400 Subject: [PATCH 3/3] test: fix test only set for spiders --- src/user/data.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/user/data.js b/src/user/data.js index 36800454d3..e7be8a8f5a 100644 --- a/src/user/data.js +++ b/src/user/data.js @@ -120,8 +120,9 @@ module.exports = function (User) { user.username = (user.hasOwnProperty('oldUid') && parseInt(user.oldUid, 10)) ? '[[global:former-user]]' : '[[global:guest]]'; user.displayname = user.username; } - user.uid = uid; - + if (uid === -1) { // if loading spider set uid to -1 otherwise spiders have uid = 0 like guests + user.uid = -1; + } return user; }); return users;