From fa57b81f8a90e239a1cfab937297e6a7b537b006 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:15:45 -0400 Subject: [PATCH 01/16] fix(deps): update dependency autoprefixer to v10.4.19 (#12428) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ff48727521..cd435a336d 100644 --- a/install/package.json +++ b/install/package.json @@ -37,7 +37,7 @@ "ace-builds": "1.32.7", "archiver": "7.0.1", "async": "3.2.5", - "autoprefixer": "10.4.18", + "autoprefixer": "10.4.19", "bcryptjs": "2.4.3", "benchpressjs": "2.5.1", "body-parser": "1.20.2", From a27b999fe632f3476605cee333c64eb7cf60d3c3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:16:06 -0400 Subject: [PATCH 02/16] fix(deps): update dependency express to v4.19.1 (#12425) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index cd435a336d..d73b6c2870 100644 --- a/install/package.json +++ b/install/package.json @@ -64,7 +64,7 @@ "daemon": "1.1.0", "diff": "5.2.0", "esbuild": "0.20.2", - "express": "4.18.3", + "express": "4.19.1", "express-session": "1.18.0", "express-useragent": "1.0.15", "fetch-cookie": "3.0.1", From ace6f12f51e4b552d307390b0a393646e055b627 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:16:15 -0400 Subject: [PATCH 03/16] fix(deps): update dependency postcss to v8.4.38 (#12429) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index d73b6c2870..69c0bf0a30 100644 --- a/install/package.json +++ b/install/package.json @@ -115,7 +115,7 @@ "passport-local": "1.0.0", "pg": "8.11.3", "pg-cursor": "2.10.3", - "postcss": "8.4.37", + "postcss": "8.4.38", "postcss-clean": "1.2.0", "progress-webpack-plugin": "1.0.16", "prompt": "1.3.0", From 2550f26f9e21d6233cfd5bba37c40c75e294c13d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:16:29 -0400 Subject: [PATCH 04/16] fix(deps): update dependency sanitize-html to v2.13.0 (#12427) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 69c0bf0a30..06b194fcf5 100644 --- a/install/package.json +++ b/install/package.json @@ -123,7 +123,7 @@ "rimraf": "5.0.5", "rss": "1.2.2", "rtlcss": "4.1.1", - "sanitize-html": "2.12.1", + "sanitize-html": "2.13.0", "sass": "1.72.0", "semver": "7.6.0", "serve-favicon": "2.5.0", From 23f46345870e791c9c43565194b85e60c45952b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:16:36 -0400 Subject: [PATCH 05/16] fix(deps): update dependency ace-builds to v1.32.8 (#12439) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 06b194fcf5..78b184c000 100644 --- a/install/package.json +++ b/install/package.json @@ -34,7 +34,7 @@ "@fortawesome/fontawesome-free": "6.5.1", "@isaacs/ttlcache": "1.4.1", "@popperjs/core": "2.11.8", - "ace-builds": "1.32.7", + "ace-builds": "1.32.8", "archiver": "7.0.1", "async": "3.2.5", "autoprefixer": "10.4.19", From ca82d020bc25698c3fff14c4f1c68a86c6288c98 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Mar 2024 13:16:59 -0400 Subject: [PATCH 06/16] fix(deps): update dependency webpack to v5.91.0 (#12426) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 78b184c000..752ed7b478 100644 --- a/install/package.json +++ b/install/package.json @@ -143,7 +143,7 @@ "toobusy-js": "0.5.1", "tough-cookie": "4.1.3", "validator": "13.11.0", - "webpack": "5.90.3", + "webpack": "5.91.0", "webpack-merge": "5.10.0", "winston": "3.12.0", "workerpool": "9.1.0", From 08be8f3c37f1f0d38c6cf5c07b4003931ad9c39d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 10:05:55 -0400 Subject: [PATCH 07/16] fix(deps): update dependency winston to v3.13.0 (#12440) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 752ed7b478..b955516f1a 100644 --- a/install/package.json +++ b/install/package.json @@ -145,7 +145,7 @@ "validator": "13.11.0", "webpack": "5.91.0", "webpack-merge": "5.10.0", - "winston": "3.12.0", + "winston": "3.13.0", "workerpool": "9.1.0", "xml": "1.0.1", "xregexp": "5.1.1", From 263ca1ca38f6a88a3b7029c6229e7b1f7ac3cdff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 13:00:37 -0400 Subject: [PATCH 08/16] fix(deps): update dependency express to v4.19.2 (#12441) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index b955516f1a..ba3194d2c2 100644 --- a/install/package.json +++ b/install/package.json @@ -64,7 +64,7 @@ "daemon": "1.1.0", "diff": "5.2.0", "esbuild": "0.20.2", - "express": "4.19.1", + "express": "4.19.2", "express-session": "1.18.0", "express-useragent": "1.0.15", "fetch-cookie": "3.0.1", From 7eb2e074d9016634838b6bbd054862ac6bb0d2c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 25 Mar 2024 16:04:54 -0400 Subject: [PATCH 09/16] make checkboxes more visible --- src/views/partials/acceptTos.tpl | 7 +++---- src/views/partials/gdpr_consent.tpl | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/views/partials/acceptTos.tpl b/src/views/partials/acceptTos.tpl index f5dafb2423..c9f7ba42fb 100644 --- a/src/views/partials/acceptTos.tpl +++ b/src/views/partials/acceptTos.tpl @@ -1,9 +1,8 @@
{termsOfUse}
-
- +
+ +
\ No newline at end of file diff --git a/src/views/partials/gdpr_consent.tpl b/src/views/partials/gdpr_consent.tpl index 21ec19074c..ea25aeb43c 100644 --- a/src/views/partials/gdpr_consent.tpl +++ b/src/views/partials/gdpr_consent.tpl @@ -2,7 +2,7 @@

[[user:consent.lead]]

[[user:consent.intro]]

- +
@@ -16,7 +16,7 @@

- +
\ No newline at end of file From 168419cf2429bf20be39056bb6acf4a7b3c307fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 26 Mar 2024 09:57:34 -0400 Subject: [PATCH 10/16] feat: add hook to modify sorting options/fields --- src/topics/sorted.js | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/topics/sorted.js b/src/topics/sorted.js index d244eefe61..23f55b63cb 100644 --- a/src/topics/sorted.js +++ b/src/topics/sorted.js @@ -159,18 +159,24 @@ module.exports = function (Topics) { return tids; } - const topicData = await Topics.getTopicsFields(tids, [ - 'tid', 'timestamp', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned', - ]); - const sortMap = { - recent: sortRecent, - old: sortOld, - create: sortCreate, - posts: sortPopular, - votes: sortVotes, - views: sortViews, - }; - const sortFn = sortMap[params.sort] || sortRecent; + const { sortMap, fields } = await plugins.hooks.fire('filter:topics.sortOptions', { + params, + fields: [ + 'tid', 'timestamp', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned', + ], + sortMap: { + recent: sortRecent, + old: sortOld, + create: sortCreate, + posts: sortPopular, + votes: sortVotes, + views: sortViews, + }, + }); + console.log(params.sort); + const topicData = await Topics.getTopicsFields(tids, fields); + const sortFn = sortMap.hasOwnProperty(params.sort) && sortMap[params.sort] ? + sortMap[params.sort] : sortRecent; if (params.floatPinned) { floatPinned(topicData, sortFn); From 3b2d8551d7b24a66e37a69b7d0c8bf028da17cb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 26 Mar 2024 10:08:30 -0400 Subject: [PATCH 11/16] refactor: remove log --- src/topics/sorted.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/topics/sorted.js b/src/topics/sorted.js index 23f55b63cb..92cc2f6ed6 100644 --- a/src/topics/sorted.js +++ b/src/topics/sorted.js @@ -173,7 +173,7 @@ module.exports = function (Topics) { views: sortViews, }, }); - console.log(params.sort); + const topicData = await Topics.getTopicsFields(tids, fields); const sortFn = sortMap.hasOwnProperty(params.sort) && sortMap[params.sort] ? sortMap[params.sort] : sortRecent; From 9a92832a4c7f3122b00fd26462965d54df749e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 26 Mar 2024 10:22:11 -0400 Subject: [PATCH 12/16] remove border gray --- src/views/partials/acceptTos.tpl | 2 +- src/views/partials/gdpr_consent.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/partials/acceptTos.tpl b/src/views/partials/acceptTos.tpl index c9f7ba42fb..d077d692b1 100644 --- a/src/views/partials/acceptTos.tpl +++ b/src/views/partials/acceptTos.tpl @@ -2,7 +2,7 @@
{termsOfUse}
- +
\ No newline at end of file diff --git a/src/views/partials/gdpr_consent.tpl b/src/views/partials/gdpr_consent.tpl index ea25aeb43c..1759d39589 100644 --- a/src/views/partials/gdpr_consent.tpl +++ b/src/views/partials/gdpr_consent.tpl @@ -2,7 +2,7 @@

[[user:consent.lead]]

[[user:consent.intro]]

- +
@@ -16,7 +16,7 @@

- +
\ No newline at end of file From 80a1a0e042edc31e66b0c66288b25acc9a0274ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 26 Mar 2024 10:24:20 -0400 Subject: [PATCH 13/16] chore: up harmony --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index ba3194d2c2..ef7e9b816f 100644 --- a/install/package.json +++ b/install/package.json @@ -103,7 +103,7 @@ "nodebb-plugin-ntfy": "1.7.4", "nodebb-plugin-spam-be-gone": "2.2.1", "nodebb-rewards-essentials": "1.0.0", - "nodebb-theme-harmony": "1.2.42", + "nodebb-theme-harmony": "1.2.43", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.4", "nodebb-theme-persona": "13.3.11", From 8b3811a19892bedfaba92b72dd9c647c2af4d709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 25 Mar 2024 16:04:54 -0400 Subject: [PATCH 14/16] make checkboxes more visible --- src/views/partials/acceptTos.tpl | 7 +++---- src/views/partials/gdpr_consent.tpl | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/views/partials/acceptTos.tpl b/src/views/partials/acceptTos.tpl index f5dafb2423..c9f7ba42fb 100644 --- a/src/views/partials/acceptTos.tpl +++ b/src/views/partials/acceptTos.tpl @@ -1,9 +1,8 @@
{termsOfUse}
-
- +
+ +
\ No newline at end of file diff --git a/src/views/partials/gdpr_consent.tpl b/src/views/partials/gdpr_consent.tpl index 21ec19074c..ea25aeb43c 100644 --- a/src/views/partials/gdpr_consent.tpl +++ b/src/views/partials/gdpr_consent.tpl @@ -2,7 +2,7 @@

[[user:consent.lead]]

[[user:consent.intro]]

- +
@@ -16,7 +16,7 @@

- +
\ No newline at end of file From ba9bcd0166e3ac4aa27c9e645c5516f00361ab0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 26 Mar 2024 10:22:11 -0400 Subject: [PATCH 15/16] remove border gray --- src/views/partials/acceptTos.tpl | 2 +- src/views/partials/gdpr_consent.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/partials/acceptTos.tpl b/src/views/partials/acceptTos.tpl index c9f7ba42fb..d077d692b1 100644 --- a/src/views/partials/acceptTos.tpl +++ b/src/views/partials/acceptTos.tpl @@ -2,7 +2,7 @@
{termsOfUse}
- +
\ No newline at end of file diff --git a/src/views/partials/gdpr_consent.tpl b/src/views/partials/gdpr_consent.tpl index ea25aeb43c..1759d39589 100644 --- a/src/views/partials/gdpr_consent.tpl +++ b/src/views/partials/gdpr_consent.tpl @@ -2,7 +2,7 @@

[[user:consent.lead]]

[[user:consent.intro]]

- +
@@ -16,7 +16,7 @@

- +
\ No newline at end of file From c6915398f911d703e6638fc17f510dcf73c9736e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 26 Mar 2024 10:24:20 -0400 Subject: [PATCH 16/16] chore: up harmony --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index c940dbc967..48e82063ed 100644 --- a/install/package.json +++ b/install/package.json @@ -103,8 +103,8 @@ "nodebb-plugin-ntfy": "1.7.3", "nodebb-plugin-spam-be-gone": "2.2.1", "nodebb-rewards-essentials": "1.0.0", - "nodebb-theme-harmony": "1.2.40", - "nodebb-theme-lavender": "7.1.7", + "nodebb-theme-harmony": "1.2.43", + "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.4", "nodebb-theme-persona": "13.3.11", "nodebb-widget-essentials": "7.0.15",