Skip to content

Node.js based forum software built for the modern web

fix: closes #14765

Barış Soner Uşaklı8f5f105fbb16
diff --git a/src/api/users.js b/src/api/users.js
index abd0fca534..fc2f9aed31 100644
--- a/src/api/users.js
+++ b/src/api/users.js
@@ -141,7 +141,15 @@ usersAPI.updateSettings = async function (caller, data) {
chatDenyList: '[]',
};
// load raw settings without parsing values to booleans
- const current = await db.getObject(`user:${data.uid}:settings`);
+ const current = await db.getObject(`user:${data.uid}:settings`) || {};
+
+ if (Object.hasOwn(current, 'postsPerPage')) {
+ current.postsPerPage = Math.max(2, Math.min(parseInt(current.postsPerPage, 10), meta.config.maxPostsPerPage));
+ }
+ if (Object.hasOwn(current, 'topicsPerPage')) {
+ current.topicsPerPage = Math.max(2, Math.min(parseInt(current.topicsPerPage, 10), meta.config.maxTopicsPerPage));
+ }
+
const payload = { ...defaults, ...current, ...data.settings };
delete payload.uid;
diff --git a/src/user/settings.js b/src/user/settings.js
index 94050e0dd8..1c69a32e3e 100644
--- a/src/user/settings.js
+++ b/src/user/settings.js
@@ -65,13 +65,13 @@ module.exports = function (User) {
parseInt(settings.unreadCutoff, 10) :
meta.config.unreadCutoff,
));
- settings.topicsPerPage = Math.max(1, Math.min(
+ settings.topicsPerPage = Math.max(2, Math.min(
meta.config.maxTopicsPerPage,
settings.topicsPerPage ?
parseInt(settings.topicsPerPage, 10) :
defaultTopicsPerPage,
));
- settings.postsPerPage = Math.max(1, Math.min(
+ settings.postsPerPage = Math.max(2, Math.min(
meta.config.maxPostsPerPage,
settings.postsPerPage ?
parseInt(settings.postsPerPage, 10) :