From d348d1dfd71b41bd954bc48bc095fe09f23787e2 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Mon, 9 Sep 2024 21:13:00 +0000 Subject: [PATCH 01/15] chore(i18n): fallback strings for new resources: nodebb.users --- public/language/ar/users.json | 1 + public/language/bg/users.json | 1 + public/language/bn/users.json | 1 + public/language/cs/users.json | 1 + public/language/da/users.json | 1 + public/language/de/users.json | 1 + public/language/el/users.json | 1 + public/language/en-US/users.json | 1 + public/language/en-x-pirate/users.json | 1 + public/language/es/users.json | 1 + public/language/et/users.json | 1 + public/language/fa-IR/users.json | 1 + public/language/fi/users.json | 1 + public/language/fr/users.json | 1 + public/language/gl/users.json | 1 + public/language/he/users.json | 1 + public/language/hr/users.json | 1 + public/language/hu/users.json | 1 + public/language/hy/users.json | 1 + public/language/id/users.json | 1 + public/language/it/users.json | 1 + public/language/ja/users.json | 1 + public/language/ko/users.json | 1 + public/language/lt/users.json | 1 + public/language/lv/users.json | 1 + public/language/ms/users.json | 1 + public/language/nb/users.json | 1 + public/language/nl/users.json | 1 + public/language/pl/users.json | 1 + public/language/pt-BR/users.json | 1 + public/language/pt-PT/users.json | 1 + public/language/ro/users.json | 1 + public/language/ru/users.json | 1 + public/language/rw/users.json | 1 + public/language/sc/users.json | 1 + public/language/sk/users.json | 1 + public/language/sl/users.json | 1 + public/language/sq-AL/users.json | 1 + public/language/sr/users.json | 1 + public/language/sv/users.json | 1 + public/language/th/users.json | 1 + public/language/tr/users.json | 1 + public/language/uk/users.json | 1 + public/language/vi/users.json | 1 + public/language/zh-CN/users.json | 1 + public/language/zh-TW/users.json | 1 + 46 files changed, 46 insertions(+) diff --git a/public/language/ar/users.json b/public/language/ar/users.json index b34cb35a49..5c2d5bee1d 100644 --- a/public/language/ar/users.json +++ b/public/language/ar/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "أحدث الأعضاء", "top-posters": "اﻷكثر مشاركة", "most-reputation": "أعلى سمعة", diff --git a/public/language/bg/users.json b/public/language/bg/users.json index a716af22d4..63ac09bea6 100644 --- a/public/language/bg/users.json +++ b/public/language/bg/users.json @@ -1,5 +1,6 @@ { "all-users": "Всички потребители", + "followed-users": "Followed Users", "latest-users": "Последни потребители", "top-posters": "С най-много публикации", "most-reputation": "С най-много репутация", diff --git a/public/language/bn/users.json b/public/language/bn/users.json index faca07fbbb..e7fc7d9a94 100644 --- a/public/language/bn/users.json +++ b/public/language/bn/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "সর্বশেষ নিবন্ধিত সদস্যরা:", "top-posters": "সর্বোচ্চ পোষ্টকারী", "most-reputation": "সর্বোচ্চ সম্মাননাধারী", diff --git a/public/language/cs/users.json b/public/language/cs/users.json index 5947554536..195ee52f14 100644 --- a/public/language/cs/users.json +++ b/public/language/cs/users.json @@ -1,5 +1,6 @@ { "all-users": "Všichni uživatelé", + "followed-users": "Followed Users", "latest-users": "Nejnovější uživatelé", "top-posters": "Nejaktivnější", "most-reputation": "Nejváženější", diff --git a/public/language/da/users.json b/public/language/da/users.json index c753726891..633884794e 100644 --- a/public/language/da/users.json +++ b/public/language/da/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Seneste brugere", "top-posters": "Top Postere", "most-reputation": "Mest Omdømme", diff --git a/public/language/de/users.json b/public/language/de/users.json index bd842c76f4..2793cb50f9 100644 --- a/public/language/de/users.json +++ b/public/language/de/users.json @@ -1,5 +1,6 @@ { "all-users": "Alle Benutzer", + "followed-users": "Followed Users", "latest-users": "Neuste Benutzer", "top-posters": "Meiste Beiträge", "most-reputation": "Höchstes Ansehen", diff --git a/public/language/el/users.json b/public/language/el/users.json index 2688ff4ae2..962f274993 100644 --- a/public/language/el/users.json +++ b/public/language/el/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Πρόσφατοι Χρήστες", "top-posters": "Top Δημοσιεύοντες", "most-reputation": "Υψηλότερη Φήμη", diff --git a/public/language/en-US/users.json b/public/language/en-US/users.json index 18882fa619..ab6dd9154a 100644 --- a/public/language/en-US/users.json +++ b/public/language/en-US/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Latest Users", "top-posters": "Top Posters", "most-reputation": "Most Reputation", diff --git a/public/language/en-x-pirate/users.json b/public/language/en-x-pirate/users.json index 435f4d2652..2da0f54540 100644 --- a/public/language/en-x-pirate/users.json +++ b/public/language/en-x-pirate/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Land lubbers", "top-posters": "Top mateys", "most-reputation": "Most Reputation", diff --git a/public/language/es/users.json b/public/language/es/users.json index b5e67ca5dc..3fe8b73df1 100644 --- a/public/language/es/users.json +++ b/public/language/es/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Últimos usuarios", "top-posters": "Top por mensajes", "most-reputation": "Más reputados", diff --git a/public/language/et/users.json b/public/language/et/users.json index 88cc5df4fa..2716eab76e 100644 --- a/public/language/et/users.json +++ b/public/language/et/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Hilised kasutajad", "top-posters": "Top postitajad", "most-reputation": "Kõige rohkem reputatsiooni", diff --git a/public/language/fa-IR/users.json b/public/language/fa-IR/users.json index da200f416b..d5a6d23186 100644 --- a/public/language/fa-IR/users.json +++ b/public/language/fa-IR/users.json @@ -1,5 +1,6 @@ { "all-users": "همه کاربران", + "followed-users": "Followed Users", "latest-users": "آخرین کاربران", "top-posters": "برترین فرستنده‌ها", "most-reputation": "بیشترین اعتبار", diff --git a/public/language/fi/users.json b/public/language/fi/users.json index 6891926beb..bad5b3e7ab 100644 --- a/public/language/fi/users.json +++ b/public/language/fi/users.json @@ -1,5 +1,6 @@ { "all-users": "Kaikki käyttäjät", + "followed-users": "Followed Users", "latest-users": "Viimeisimmät käyttäjät", "top-posters": "Aktiivisimmat julkaisijat", "most-reputation": "Maineikkain", diff --git a/public/language/fr/users.json b/public/language/fr/users.json index e0417609bb..d91152241f 100644 --- a/public/language/fr/users.json +++ b/public/language/fr/users.json @@ -1,5 +1,6 @@ { "all-users": "Tous les utilisateurs", + "followed-users": "Followed Users", "latest-users": "Derniers inscrits", "top-posters": "Utilisateurs les plus actifs", "most-reputation": "Meilleur Réputation", diff --git a/public/language/gl/users.json b/public/language/gl/users.json index d5690a4258..fab274ce42 100644 --- a/public/language/gl/users.json +++ b/public/language/gl/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Últimos usuarios", "top-posters": "Maiores Publicadores", "most-reputation": "Máis Reputados", diff --git a/public/language/he/users.json b/public/language/he/users.json index 3d8f2d90af..67eb248c70 100644 --- a/public/language/he/users.json +++ b/public/language/he/users.json @@ -1,5 +1,6 @@ { "all-users": "כל המשתמשים", + "followed-users": "Followed Users", "latest-users": "משתמשים אחרונים", "top-posters": "מפרסמים הכי הרבה", "most-reputation": "המוניטין הגבוה ביותר", diff --git a/public/language/hr/users.json b/public/language/hr/users.json index 4e19ec6e73..8fe88453d6 100644 --- a/public/language/hr/users.json +++ b/public/language/hr/users.json @@ -1,5 +1,6 @@ { "all-users": "Svi korisnici", + "followed-users": "Followed Users", "latest-users": "Posljednji korisnici", "top-posters": "Najviše objava", "most-reputation": "Najveća reputacija", diff --git a/public/language/hu/users.json b/public/language/hu/users.json index 5c10cca3ec..f47545cd78 100644 --- a/public/language/hu/users.json +++ b/public/language/hu/users.json @@ -1,5 +1,6 @@ { "all-users": "Összes Felhasználó", + "followed-users": "Followed Users", "latest-users": "Legújabb felhasználók", "top-posters": "Legaktívabbak", "most-reputation": "Legnépszerűbbek", diff --git a/public/language/hy/users.json b/public/language/hy/users.json index e94f9f3271..42c66aa7e9 100644 --- a/public/language/hy/users.json +++ b/public/language/hy/users.json @@ -1,5 +1,6 @@ { "all-users": "Բոլոր օգտատերերը", + "followed-users": "Followed Users", "latest-users": "Վերջին օգտատերերը", "top-posters": "Ամենաշատ գրառողները", "most-reputation": "Ամենաբարձր վարկանիշը", diff --git a/public/language/id/users.json b/public/language/id/users.json index 6d1ecde478..cbdb652b31 100644 --- a/public/language/id/users.json +++ b/public/language/id/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Pengguna Terakhir", "top-posters": "Posting Terbanyak", "most-reputation": "Reputasi Terbanyak", diff --git a/public/language/it/users.json b/public/language/it/users.json index bfbbc52a6f..19a5574cd8 100644 --- a/public/language/it/users.json +++ b/public/language/it/users.json @@ -1,5 +1,6 @@ { "all-users": "Tutti gli utenti", + "followed-users": "Followed Users", "latest-users": "Ultimi Utenti", "top-posters": "Utenti più attivi", "most-reputation": "Reputazione più alta", diff --git a/public/language/ja/users.json b/public/language/ja/users.json index acde8c9719..d0408692ee 100644 --- a/public/language/ja/users.json +++ b/public/language/ja/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "新しいユーザー", "top-posters": "最も投稿したユーザー", "most-reputation": "最も評価されたユーザー", diff --git a/public/language/ko/users.json b/public/language/ko/users.json index 56d2b1c1bc..22a34b4a92 100644 --- a/public/language/ko/users.json +++ b/public/language/ko/users.json @@ -1,5 +1,6 @@ { "all-users": "모든 사용자", + "followed-users": "Followed Users", "latest-users": "최신 사용자", "top-posters": "최다 게시자", "most-reputation": "가장 많은 평판", diff --git a/public/language/lt/users.json b/public/language/lt/users.json index 4febc6a4ae..06c20ade22 100644 --- a/public/language/lt/users.json +++ b/public/language/lt/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Paskutiniai vartotojai", "top-posters": "Geriausi autoriai", "most-reputation": "Didžiausia reputacija", diff --git a/public/language/lv/users.json b/public/language/lv/users.json index 97e2626bf3..b016c675ac 100644 --- a/public/language/lv/users.json +++ b/public/language/lv/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Jaunākie lietotāji", "top-posters": "Visvairāk rakstu", "most-reputation": "Visvairāk ranga punktu", diff --git a/public/language/ms/users.json b/public/language/ms/users.json index 568a3c6d3c..91f6d4d969 100644 --- a/public/language/ms/users.json +++ b/public/language/ms/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Pengguna terkini", "top-posters": "Pengirim terbanyak", "most-reputation": "Reputasi terbaik", diff --git a/public/language/nb/users.json b/public/language/nb/users.json index 173ea13547..1f03314930 100644 --- a/public/language/nb/users.json +++ b/public/language/nb/users.json @@ -1,5 +1,6 @@ { "all-users": "Alle brukere", + "followed-users": "Followed Users", "latest-users": "Seneste brukere", "top-posters": "Flest innlegg", "most-reputation": "Best omdømme", diff --git a/public/language/nl/users.json b/public/language/nl/users.json index eb02775a01..93c28926c2 100644 --- a/public/language/nl/users.json +++ b/public/language/nl/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Laatste gebruikers", "top-posters": "Meest actieve leden", "most-reputation": "Meeste reputatie", diff --git a/public/language/pl/users.json b/public/language/pl/users.json index 768cf44112..8f1717a92e 100644 --- a/public/language/pl/users.json +++ b/public/language/pl/users.json @@ -1,5 +1,6 @@ { "all-users": "Wszyscy użytkownicy", + "followed-users": "Followed Users", "latest-users": "Nowi użytkownicy", "top-posters": "Najwięcej postów", "most-reputation": "Najwyższa reputacja", diff --git a/public/language/pt-BR/users.json b/public/language/pt-BR/users.json index 282fb46d5e..19ba354d54 100644 --- a/public/language/pt-BR/users.json +++ b/public/language/pt-BR/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Últimos Usuários", "top-posters": "Principais Participantes", "most-reputation": "Maior Reputação", diff --git a/public/language/pt-PT/users.json b/public/language/pt-PT/users.json index 1e16097101..fa138eb1a1 100644 --- a/public/language/pt-PT/users.json +++ b/public/language/pt-PT/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Utilizadores Recentes", "top-posters": "Top de publicadores", "most-reputation": "Maior Reputação", diff --git a/public/language/ro/users.json b/public/language/ro/users.json index 614f7160eb..fd6c6a6c58 100644 --- a/public/language/ro/users.json +++ b/public/language/ro/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Ultimii Utilizatori", "top-posters": "Top Utilizatori", "most-reputation": "Cei mai apreciați utilizatori", diff --git a/public/language/ru/users.json b/public/language/ru/users.json index 68e0e0b7e1..33982ab352 100644 --- a/public/language/ru/users.json +++ b/public/language/ru/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Новые пользователи", "top-posters": "Самые активные", "most-reputation": "Лучшая репутация", diff --git a/public/language/rw/users.json b/public/language/rw/users.json index 5dca0e9e97..e26b0fa4ae 100644 --- a/public/language/rw/users.json +++ b/public/language/rw/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Abantu Bashya", "top-posters": "Abashyizeho Byinshi", "most-reputation": "Abafite Amanota Menshi", diff --git a/public/language/sc/users.json b/public/language/sc/users.json index 035176aa4d..57a5f5c15f 100644 --- a/public/language/sc/users.json +++ b/public/language/sc/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Ùrtimos Impitadores", "top-posters": "Prus Ativos", "most-reputation": "Prus Famados", diff --git a/public/language/sk/users.json b/public/language/sk/users.json index 8c94039b7a..a763f4b1d3 100644 --- a/public/language/sk/users.json +++ b/public/language/sk/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Najnovší používatelia", "top-posters": "Najaktívnejší", "most-reputation": "Najváženejší", diff --git a/public/language/sl/users.json b/public/language/sl/users.json index a81c715447..f377e33277 100644 --- a/public/language/sl/users.json +++ b/public/language/sl/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Zadnji uporabniki", "top-posters": "Najboljši uporabniki", "most-reputation": "Največ ugleda", diff --git a/public/language/sq-AL/users.json b/public/language/sq-AL/users.json index d5d171e0b8..c064822c9d 100644 --- a/public/language/sq-AL/users.json +++ b/public/language/sq-AL/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Përdoruesit e fundit", "top-posters": "Postuesit më të mirë", "most-reputation": "Me Reputacion", diff --git a/public/language/sr/users.json b/public/language/sr/users.json index 51c24f73fd..096af8474b 100644 --- a/public/language/sr/users.json +++ b/public/language/sr/users.json @@ -1,5 +1,6 @@ { "all-users": "Сви корисници", + "followed-users": "Followed Users", "latest-users": "Најновији корисници", "top-posters": "Највише порука", "most-reputation": "Највећи углед", diff --git a/public/language/sv/users.json b/public/language/sv/users.json index 6c5a2a354a..e918e1a276 100644 --- a/public/language/sv/users.json +++ b/public/language/sv/users.json @@ -1,5 +1,6 @@ { "all-users": "Alla användare", + "followed-users": "Followed Users", "latest-users": "Senaste användarna", "top-posters": "Flest inlägg", "most-reputation": "Bäst rykte", diff --git a/public/language/th/users.json b/public/language/th/users.json index e2cb57f4ea..353ab6b1da 100644 --- a/public/language/th/users.json +++ b/public/language/th/users.json @@ -1,5 +1,6 @@ { "all-users": "ผู้ใช้งานทั้งหมด", + "followed-users": "Followed Users", "latest-users": "ผู้ใช้งานล่าสุด", "top-posters": "ผู้ที่โพสต์มากที่สุด", "most-reputation": "ผู้ที่มีชื่อเสียงมากที่สุด", diff --git a/public/language/tr/users.json b/public/language/tr/users.json index 60fd516e80..db602962b0 100644 --- a/public/language/tr/users.json +++ b/public/language/tr/users.json @@ -1,5 +1,6 @@ { "all-users": "Tüm kullanıcılar", + "followed-users": "Followed Users", "latest-users": "En Yeni Kullanıcılar", "top-posters": "En Fazla Gönderim Yapanlar", "most-reputation": "En Saygınlar", diff --git a/public/language/uk/users.json b/public/language/uk/users.json index 04f05b8419..397671fb7a 100644 --- a/public/language/uk/users.json +++ b/public/language/uk/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "Останні користувачі", "top-posters": "Кращі автори", "most-reputation": "Найбільша репутація", diff --git a/public/language/vi/users.json b/public/language/vi/users.json index dd106da2ac..15f53a3c3d 100644 --- a/public/language/vi/users.json +++ b/public/language/vi/users.json @@ -1,5 +1,6 @@ { "all-users": "Tất Cả Người Dùng", + "followed-users": "Followed Users", "latest-users": "Thành viên mới nhất", "top-posters": "Thành viên đăng bài nhiều nhất", "most-reputation": "Uy Tín Nhất", diff --git a/public/language/zh-CN/users.json b/public/language/zh-CN/users.json index 7557b7cbdc..cd9db8116c 100644 --- a/public/language/zh-CN/users.json +++ b/public/language/zh-CN/users.json @@ -1,5 +1,6 @@ { "all-users": "所有用户", + "followed-users": "Followed Users", "latest-users": "最新用户", "top-posters": "发帖排行", "most-reputation": "声望排行", diff --git a/public/language/zh-TW/users.json b/public/language/zh-TW/users.json index 32f803ff9f..87272ae2fb 100644 --- a/public/language/zh-TW/users.json +++ b/public/language/zh-TW/users.json @@ -1,5 +1,6 @@ { "all-users": "All Users", + "followed-users": "Followed Users", "latest-users": "最新使用者", "top-posters": "發文排行", "most-reputation": "聲望排行", From 705796f6289dc80a20cb5b0cb0ff0417f089efe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Sep 2024 09:38:05 -0400 Subject: [PATCH 02/15] feat: add action:topics.scheduled.notify add missing notify calls into scheduled topics --- src/topics/scheduled.js | 12 +++++++++++- src/topics/tags.js | 1 - 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/topics/scheduled.js b/src/topics/scheduled.js index 0a91067d59..5b98bea84f 100644 --- a/src/topics/scheduled.js +++ b/src/topics/scheduled.js @@ -8,8 +8,10 @@ const db = require('../database'); const posts = require('../posts'); const socketHelpers = require('../socket.io/helpers'); const topics = require('./index'); +const categories = require('../categories'); const groups = require('../groups'); const user = require('../user'); +const plugins = require('../plugins'); const Scheduled = module.exports; @@ -117,13 +119,21 @@ async function sendNotifications(uids, topicsData) { } }); - return Promise.all(topicsData.map( + await Promise.all(topicsData.map( (t, idx) => user.notifications.sendTopicNotificationToFollowers(t.uid, t, postsData[idx]) + ).concat( + postsData.map(p => topics.notifyTagFollowers(p, p.uid)) + ).concat( + postsData.map(p => categories.notifyCategoryFollowers(p, p.uid)) ).concat( topicsData.map( (t, idx) => socketHelpers.notifyNew(t.uid, 'newTopic', { posts: [postsData[idx]], topic: t }) ) )); + plugins.hooks.fire('action:topics.scheduled.notify', { + posts: postsData, + topics: topicsData, + }); } async function updateUserLastposttimes(uids, topicsData) { diff --git a/src/topics/tags.js b/src/topics/tags.js index 540bd314bd..2cc8be1ffa 100644 --- a/src/topics/tags.js +++ b/src/topics/tags.js @@ -588,7 +588,6 @@ module.exports = function (Topics) { }; Topics.notifyTagFollowers = async function (postData, exceptUid) { - console.log(); let { tags } = postData.topic; if (!tags.length) { return; From db84d04a38013510020904387b283d1bc12581dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Sep 2024 12:29:59 -0400 Subject: [PATCH 03/15] chore: up persona --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 4413a9403d..d0fd94ce1d 100644 --- a/install/package.json +++ b/install/package.json @@ -107,7 +107,7 @@ "nodebb-theme-harmony": "1.2.64", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.6", - "nodebb-theme-persona": "13.3.25", + "nodebb-theme-persona": "13.3.26", "nodebb-widget-essentials": "7.0.25", "nodemailer": "6.9.13", "nprogress": "0.2.0", From c9cadbad7e60f7ed7ca56300a9e4c55354f16efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Sep 2024 12:47:56 -0400 Subject: [PATCH 04/15] chore: up persona --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index d0fd94ce1d..83e315c24e 100644 --- a/install/package.json +++ b/install/package.json @@ -107,7 +107,7 @@ "nodebb-theme-harmony": "1.2.64", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.6", - "nodebb-theme-persona": "13.3.26", + "nodebb-theme-persona": "13.3.27", "nodebb-widget-essentials": "7.0.25", "nodemailer": "6.9.13", "nprogress": "0.2.0", From ea3ffdacd99e72959510765d3f30b090336b272d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Sep 2024 13:09:48 -0400 Subject: [PATCH 05/15] move login/register to core --- src/views/login.tpl | 101 +++++++++++++++++++++++++++++++++++++++ src/views/register.tpl | 104 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+) create mode 100644 src/views/login.tpl create mode 100644 src/views/register.tpl diff --git a/src/views/login.tpl b/src/views/login.tpl new file mode 100644 index 0000000000..13ca55b8fa --- /dev/null +++ b/src/views/login.tpl @@ -0,0 +1,101 @@ +
+ {{{each widgets.header}}} + {{widgets.header.html}} + {{{end}}} +
+ +
+ {{{each widgets.footer}}} + {{widgets.footer.html}} + {{{end}}} +
\ No newline at end of file diff --git a/src/views/register.tpl b/src/views/register.tpl new file mode 100644 index 0000000000..ca7fac3664 --- /dev/null +++ b/src/views/register.tpl @@ -0,0 +1,104 @@ +
+ {{{each widgets.header}}} + {{widgets.header.html}} + {{{end}}} +
+
+
+

[[global:register]]

+
+ +
+
+
+
+ +
+ + + [[register:help.username-restrictions, {minimumUsernameLength}, {maximumUsernameLength}]] +
+
+ +
+ +
+ + + [[register:help.minimum-password-length, {minimumPasswordLength}]] + +
+
+ +
+ +
+ + +
+
+ + {{{ each regFormEntry }}} +
+ +
{{./html}}
+
+ {{{ end }}} + + + + + +
+ + [[register:already-have-account]] + [[global:login]] + + + + +
+
+
+ + {{{ if alternate_logins }}} +
+
+ + +
+
+ {{{ end }}} +
+
+
+ {{{each widgets.sidebar}}} + {{widgets.sidebar.html}} + {{{end}}} +
+
+
+ {{{each widgets.footer}}} + {{widgets.footer.html}} + {{{end}}} +
\ No newline at end of file From 35e92d6df7361e26dd43bd64ead3caf0592dc7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Sep 2024 13:10:36 -0400 Subject: [PATCH 06/15] chore: up themes --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 39b9916b24..158f0fc175 100644 --- a/install/package.json +++ b/install/package.json @@ -104,10 +104,10 @@ "nodebb-plugin-ntfy": "1.7.6", "nodebb-plugin-spam-be-gone": "2.2.2", "nodebb-rewards-essentials": "1.0.0", - "nodebb-theme-harmony": "1.2.64", + "nodebb-theme-harmony": "1.2.65", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.6", - "nodebb-theme-persona": "13.3.25", + "nodebb-theme-persona": "13.3.28", "nodebb-widget-essentials": "7.0.27", "nodemailer": "6.9.15", "nprogress": "0.2.0", From 1abececab6fc4aba3c5b8a5dc7c0cd88925c757e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Sep 2024 13:29:13 -0400 Subject: [PATCH 07/15] chore: up persona --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 158f0fc175..a2287fa0a9 100644 --- a/install/package.json +++ b/install/package.json @@ -107,7 +107,7 @@ "nodebb-theme-harmony": "1.2.65", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.6", - "nodebb-theme-persona": "13.3.28", + "nodebb-theme-persona": "13.3.29", "nodebb-widget-essentials": "7.0.27", "nodemailer": "6.9.15", "nprogress": "0.2.0", From 8943a54d82cc094f356a1f165b87784836397154 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:36:42 -0400 Subject: [PATCH 08/15] fix(deps): update dependency body-parser to v1.20.3 (#12783) 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 a2287fa0a9..cb7c147ede 100644 --- a/install/package.json +++ b/install/package.json @@ -41,7 +41,7 @@ "autoprefixer": "10.4.20", "bcryptjs": "2.4.3", "benchpressjs": "2.5.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "bootbox": "6.0.0", "bootstrap": "5.3.3", "bootswatch": "5.3.3", From 6dc581773ae86964d273c78e8e4a514f27eb6054 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:38:26 -0400 Subject: [PATCH 09/15] fix(deps): update fontsource monorepo (#12779) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index cb7c147ede..a8a9b63817 100644 --- a/install/package.json +++ b/install/package.json @@ -29,8 +29,8 @@ }, "dependencies": { "@adactive/bootstrap-tagsinput": "0.8.2", - "@fontsource/inter": "5.0.20", - "@fontsource/poppins": "5.0.15", + "@fontsource/inter": "5.0.21", + "@fontsource/poppins": "5.0.16", "@fortawesome/fontawesome-free": "6.6.0", "@isaacs/ttlcache": "1.4.1", "@nodebb/spider-detector": "2.0.3", From 8af4a18465671dbab9a5a57c60502f113730132e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 10 Sep 2024 16:46:22 -0400 Subject: [PATCH 10/15] chore: up persona --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index a8a9b63817..d9d1a512f9 100644 --- a/install/package.json +++ b/install/package.json @@ -107,7 +107,7 @@ "nodebb-theme-harmony": "1.2.65", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.6", - "nodebb-theme-persona": "13.3.29", + "nodebb-theme-persona": "13.3.33", "nodebb-widget-essentials": "7.0.27", "nodemailer": "6.9.15", "nprogress": "0.2.0", From c58e09f91eb9d544f2f6365bed884020cdff3c2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 11 Sep 2024 14:04:19 -0400 Subject: [PATCH 11/15] refactor: fix btn-ghost usage to match bootstrap remove btn-ghost-sm and replace with btn btn-ghost btn-sm --- public/scss/admin/common.scss | 47 ++---- public/scss/admin/sidebar.scss | 4 +- public/scss/btn-ghost.scss | 47 ++---- public/src/admin/extend/plugins.js | 4 +- public/src/admin/settings.js | 2 +- src/views/admin/advanced/hooks.tpl | 2 +- src/views/admin/manage/admins-mods.tpl | 6 +- src/views/admin/manage/categories.tpl | 2 +- src/views/admin/manage/category.tpl | 14 +- src/views/admin/manage/group.tpl | 12 +- .../category/selector-dropdown-content.tpl | 2 +- src/views/admin/partials/navigation.tpl | 140 +++++++++--------- src/views/admin/partials/offcanvas.tpl | 2 +- .../admin/partials/quick_actions/buttons.tpl | 6 +- src/views/admin/partials/sidebar-left.tpl | 2 +- src/views/chat.tpl | 2 +- src/views/chats.tpl | 6 +- src/views/partials/chats/composer.tpl | 8 +- src/views/partials/chats/options.tpl | 10 +- src/views/partials/chats/parent.tpl | 2 +- src/views/partials/chats/recent_room.tpl | 4 +- src/views/partials/chats/user-list.tpl | 2 +- 22 files changed, 139 insertions(+), 187 deletions(-) diff --git a/public/scss/admin/common.scss b/public/scss/admin/common.scss index 945c5b89e3..81e74f3289 100644 --- a/public/scss/admin/common.scss +++ b/public/scss/admin/common.scss @@ -13,43 +13,19 @@ .tracking-tight { letter-spacing: -0.02em; } -@mixin btn-ghost-base { - display: flex; - align-items: center; - justify-content: center; - gap: ($spacer * 0.5); - border-radius: $border-radius-sm; - border-width: 1px; - border-color: transparent; - background-color: transparent; - padding: ($spacer * 0.25) ($spacer * 0.5); - text-align: left; - --bs-text-opacity: 1; - color: $btn-ghost-color; - font-family: $font-family-secondary; - cursor: pointer; - &:hover, &.active { - background-color: $btn-ghost-hover-color; - text-decoration: none; - } -} - +// https://getbootstrap.com/docs/5.3/components/buttons/#variables .btn-ghost { - @include btn-ghost-base(); - line-height: 1.5rem; - > i { - line-height: 1.5rem; - } + --bs-btn-color: #{$btn-ghost-color}; + --bs-btn-bg: transparent; + --bs-btn-border-color: transparent; + --bs-btn-box-shadow: none; + --bs-btn-hover-color: #{$btn-ghost-color}; + --bs-btn-hover-bg: #{$btn-ghost-hover-color}; + --bs-btn-hover-border-color: #{$btn-ghost-hover-color}; + --bs-btn-active-bg: #{$btn-ghost-hover-color}; + --bs-btn-active-border-color: transparent; } -.btn-ghost-sm { - @include btn-ghost-base(); - font-size: 0.875rem; - line-height: 1.25rem; - > i { - line-height: 1.25rem; - } -} @include color-mode(dark) { .btn-light { @@ -58,10 +34,11 @@ .text-bg-light { @extend .text-bg-dark; } - .btn-ghost, .btn-ghost-sm { + .btn-ghost { color: $btn-ghost-color-dark; &:hover, &.active { background-color: $btn-ghost-hover-color-dark; + border-color: $btn-ghost-hover-color-dark; } } } diff --git a/public/scss/admin/sidebar.scss b/public/scss/admin/sidebar.scss index 0a354fdd6c..0ca0d252d0 100644 --- a/public/scss/admin/sidebar.scss +++ b/public/scss/admin/sidebar.scss @@ -1,12 +1,12 @@ #sidebar-left, #offcanvas { - .btn-ghost, .btn-ghost-sm { + .btn-ghost { i { color: $gray-500; } } .accordion-body { - .btn-ghost-sm { + .btn-ghost.btn-sm { padding-left: 38px!important; } } diff --git a/public/scss/btn-ghost.scss b/public/scss/btn-ghost.scss index 80b819171a..704f07d202 100644 --- a/public/scss/btn-ghost.scss +++ b/public/scss/btn-ghost.scss @@ -12,40 +12,15 @@ $btn-ghost-active-color-dark: lighten($btn-ghost-hover-color-dark, 5%)!default; --btn-ghost-active-color: #{$btn-ghost-active-color-dark}; } -@mixin btn-ghost-base { - display: flex; - align-items: center; - justify-content: center; - gap: ($spacer * 0.5); - border-radius: $border-radius-sm; - border-width: 1px; - border-color: transparent; - background-color: transparent; - box-shadow: none; - padding: ($spacer * 0.25) ($spacer * 0.5); - text-align: left; - --bs-text-opacity: 1; - color: inherit !important; - cursor: pointer; - &:hover, &.active { - background-color: var(--btn-ghost-hover-color); - text-decoration: none; - } -} - +// https://getbootstrap.com/docs/5.3/components/buttons/#variables .btn-ghost { - @include btn-ghost-base(); - line-height: 1.5rem; - > i { - line-height: 1.5rem; - } -} - -.btn-ghost-sm { - @include btn-ghost-base(); - font-size: 0.875rem; - line-height: 1.25rem; - > i { - line-height: 1.25rem; - } -} \ No newline at end of file + --bs-btn-color: inherit!important; + --bs-btn-bg: transparent; + --bs-btn-border-color: transparent; + --bs-btn-box-shadow: none; + --bs-btn-hover-color: inherit; + --bs-btn-hover-bg: #{$btn-ghost-hover-color}; + --bs-btn-hover-border-color: #{$btn-ghost-hover-color}; + --bs-btn-active-bg: #{$btn-ghost-hover-color}; + --bs-btn-active-border-color: transparent; + } \ No newline at end of file diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index 5d33b4d9b5..6a8816d5a4 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -198,10 +198,10 @@ define('admin/extend/plugins', [
  • ${plugin}
    -
    +
    -
    +
    diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index de7cd48096..0721d8c209 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -21,7 +21,7 @@ define('admin/settings', [ if (anchor.startsWith('section')) { $this.parent().attr('id', anchor); } - tocList.append(`${header}`); + tocList.append(`${header}`); }); const offset = mainHader.outerHeight(true); // https://stackoverflow.com/a/11814275/583363 diff --git a/src/views/admin/advanced/hooks.tpl b/src/views/admin/advanced/hooks.tpl index 61aaa26ebc..fceffc3655 100644 --- a/src/views/admin/advanced/hooks.tpl +++ b/src/views/admin/advanced/hooks.tpl @@ -4,7 +4,7 @@
    {hooks.hookName} - +
    diff --git a/src/views/admin/manage/admins-mods.tpl b/src/views/admin/manage/admins-mods.tpl index 977c59275d..6375ea923e 100644 --- a/src/views/admin/manage/admins-mods.tpl +++ b/src/views/admin/manage/admins-mods.tpl @@ -15,7 +15,7 @@
    {buildAvatar(admins.members, "24px", true)} {admins.members.username} -
    @@ -35,7 +35,7 @@
    {buildAvatar(globalMods.members, "24px", true)} {globalMods.members.username} -
    @@ -87,7 +87,7 @@
    {buildAvatar(categoryMods.moderators, "24px", true)} {categoryMods.moderators.username} -
    diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl index 512105dbac..bed5850325 100644 --- a/src/views/admin/manage/categories.tpl +++ b/src/views/admin/manage/categories.tpl @@ -4,7 +4,7 @@

    [[admin/manage/categories:manage-categories]]

    - + diff --git a/src/views/admin/manage/category.tpl b/src/views/admin/manage/category.tpl index fb2afcedec..9f2ebbe2c3 100644 --- a/src/views/admin/manage/category.tpl +++ b/src/views/admin/manage/category.tpl @@ -166,27 +166,27 @@
    - [[admin/manage/categories:back-to-categories]] + [[admin/manage/categories:back-to-categories]]
    - - [[admin/manage/categories:analytics]] + [[admin/manage/categories:analytics]] - + [[admin/manage/categories:privileges]] - + [[admin/manage/categories:view-category]]
    - - diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl index e8ce44d981..114d5e8692 100644 --- a/src/views/admin/manage/group.tpl +++ b/src/views/admin/manage/group.tpl @@ -6,7 +6,7 @@

    [[admin/manage/groups:edit-group]]

    -