Merge remote-tracking branch 'origin/develop' into activitypub

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.5",
+        "ace-builds": "1.32.6",
         "archiver": "6.0.1",
         "async": "3.2.5",
         "autoprefixer": "10.4.17",
@@ -103,7 +103,7 @@
         "nodebb-plugin-ntfy": "1.7.3",
         "nodebb-plugin-spam-be-gone": "2.2.0",
         "nodebb-rewards-essentials": "1.0.0",
-        "nodebb-theme-harmony": "1.2.20",
+        "nodebb-theme-harmony": "1.2.21",
         "nodebb-theme-lavender": "7.1.7",
         "nodebb-theme-peace": "2.2.0",
         "nodebb-theme-persona": "13.3.4",

public/language/ar/topic.json

@@ -35,6 +35,7 @@
     "pinned": "مثبت",
     "pinned-with-expiry": "مثبت حتى %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "منقول",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/bg/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Закачена",
     "pinned-with-expiry": "Закачена до %1",
     "scheduled": "Насрочена",
+    "deleted": "Deleted",
     "moved": "Преместена",
     "moved-from": "Преместена от %1",
     "copy-code": "Копиране на кода",

public/language/bn/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/cs/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Připnuto",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Přesunuto",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/da/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Flyttet",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/de/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Angeheftet",
     "pinned-with-expiry": "Angepinnt bis %1",
     "scheduled": "Geplant",
+    "deleted": "Deleted",
     "moved": "Verschoben",
     "moved-from": "Verschoben von %1",
     "copy-code": "Code kopieren",

public/language/el/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/en-GB/topic.json

@@ -38,6 +38,7 @@
 	"pinned": "Pinned",
 	"pinned-with-expiry": "Pinned until %1",
 	"scheduled": "Scheduled",
+	"deleted": "Deleted",
 	"moved": "Moved",
 	"moved-from": "Moved from %1",
 	"copy-code": "Copy Code",

public/language/en-US/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/en-x-pirate/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/es/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Fijo",
     "pinned-with-expiry": "Anclado hasta %1",
     "scheduled": "Programado",
+    "deleted": "Deleted",
     "moved": "Movido",
     "moved-from": "Movido desde %1",
     "copy-code": "Copiar Codigo",

public/language/et/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Märgistatud",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Liigutatud",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/fa-IR/topic.json

@@ -35,6 +35,7 @@
     "pinned": "سنجاق شده",
     "pinned-with-expiry": "سنجاق‌شده تا %1",
     "scheduled": "زمان بندی شده",
+    "deleted": "Deleted",
     "moved": "منتقل شده",
     "moved-from": "جابه‌جا شده از %1",
     "copy-code": "کپی کردن کد",

public/language/fi/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Kiinnitetty",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Siirretty",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/fr/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Épinglé",
     "pinned-with-expiry": "Épinglé jusqu'au %1",
     "scheduled": "Planifier",
+    "deleted": "Deleted",
     "moved": "Déplacé",
     "moved-from": "Déplacé de %1",
     "copy-code": "Copier le code",

public/language/gl/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Fixo",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Movido",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/he/topic.json

@@ -35,6 +35,7 @@
     "pinned": "נעוץ",
     "pinned-with-expiry": "נעוץ עד %1",
     "scheduled": "מתוזמן",
+    "deleted": "Deleted",
     "moved": "הועבר",
     "moved-from": "הועבר מ-%1",
     "copy-code": "העתקת קוד",

public/language/hr/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Zakačeno",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Premješteno",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/hu/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Rögzített",
     "pinned-with-expiry": "Kitűzve eddig: %1",
     "scheduled": "Időzített",
+    "deleted": "Deleted",
     "moved": "Áthelyezett",
     "moved-from": "Áthelyezés innen %1",
     "copy-code": "Copy Code",

public/language/hy/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Ամրացված",
     "pinned-with-expiry": "Ամրացված է մինչև %1",
     "scheduled": "Պլանավորված",
+    "deleted": "Deleted",
     "moved": "Տեղափոխվել է",
     "moved-from": "Տեղափոխվել է %1-ից",
     "copy-code": "Պանճենել կոդը",

public/language/id/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/it/global.json

@@ -24,14 +24,14 @@
     "cancel": "Annulla",
     "close": "Chiudi",
     "pagination": "Impaginazione",
-    "pagination.previouspage": "Previous Page",
+    "pagination.previouspage": "Pagina precedente",
-    "pagination.nextpage": "Next Page",
+    "pagination.nextpage": "Pagina successiva",
-    "pagination.firstpage": "First Page",
+    "pagination.firstpage": "Prima pagina",
-    "pagination.lastpage": "Last Page",
+    "pagination.lastpage": "Ultima pagina",
     "pagination.out-of": "%1 di %2",
     "pagination.enter-index": "Vai all'indice dei post",
-    "pagination.go-to-page": "Go to page",
+    "pagination.go-to-page": "Vai alla pagina",
-    "pagination.page-x": "Page %1",
+    "pagination.page-x": "Pagina %1",
     "header.brand-logo": "Logo del marchio",
     "header.admin": "Amministratore",
     "header.categories": "Categorie",

public/language/it/topic.json

@@ -15,7 +15,7 @@
     "replies-to-this-post": "%1 Risposte",
     "one-reply-to-this-post": "1 Risposta",
     "last-reply-time": "Ultima Risposta",
-    "reply-options": "Reply options",
+    "reply-options": "Opzioni di risposta",
     "reply-as-topic": "Topic risposta",
     "guest-login-reply": "Effettua l'accesso per rispondere",
     "login-to-view": "Accedi per visualizzare",
@@ -35,6 +35,7 @@
     "pinned": "Fissato",
     "pinned-with-expiry": "Fissato fino al %1",
     "scheduled": "Pianificato",
+    "deleted": "Deleted",
     "moved": "Spostato",
     "moved-from": "Spostato da %1",
     "copy-code": "Copia codice",
@@ -205,13 +206,13 @@
     "last-post": "Ultimo post",
     "go-to-my-next-post": "Vai al mio prossimo post",
     "no-more-next-post": "Non hai più post in questa discussione",
-    "open-composer": "Open composer",
+    "open-composer": "Apri compositore",
     "post-quick-reply": "Risposta rapida",
     "navigator.index": "Post %1 di %2",
     "navigator.unread": "%1 non letto",
     "upvote-post": "Vota positivamente il post",
     "downvote-post": "Vota negativamente il post",
     "post-tools": "Strumenti post",
-    "unread-posts-link": "Unread posts link",
+    "unread-posts-link": "Link ai post non letti",
-    "thumb-image": "Topic thumbnail image"
+    "thumb-image": "Immagine anteprima della discussione"
 }

public/language/it/unread.json

@@ -3,7 +3,7 @@
     "no-unread-topics": "Non ci sono discussioni non lette.",
     "load-more": "Carica di più",
     "mark-as-read": "Segna come Letto",
-    "mark-as-unread": "Mark as Unread",
+    "mark-as-unread": "Segna come non letto",
     "selected": "Selezionato",
     "all": "Tutti",
     "all-categories": "Tutte le categorie",

public/language/ja/topic.json

@@ -35,6 +35,7 @@
     "pinned": "ピンされた",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "移動しました",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/ko/topic.json

@@ -35,6 +35,7 @@
     "pinned": "고정된 게시물",
     "pinned-with-expiry": "%1까지 상단 고정",
     "scheduled": "예약됨",
+    "deleted": "Deleted",
     "moved": "이동된 게시물",
     "moved-from": "%1부터 상단 고정 해제",
     "copy-code": "Copy Code",

public/language/lt/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Perkelta",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/lv/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Piespraustie",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Pārvietots",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/ms/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/nb/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Festet",
     "pinned-with-expiry": "Festet til %1",
     "scheduled": "Planlagt",
+    "deleted": "Deleted",
     "moved": "Flyttet",
     "moved-from": "Flyttet fra %1",
     "copy-code": "Kopier kode",

public/language/nl/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Verplaatst",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/pl/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Przypięty",
     "pinned-with-expiry": "Przypięte do %1",
     "scheduled": "Zaplanowany",
+    "deleted": "Deleted",
     "moved": "Przeniesiony",
     "moved-from": "Przeniesiony z %1",
     "copy-code": "Copy Code",

public/language/pt-BR/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Fixado",
     "pinned-with-expiry": "Fixado até %1",
     "scheduled": "Agendado",
+    "deleted": "Deleted",
     "moved": "Movido",
     "moved-from": "Movido de %1",
     "copy-code": "Copy Code",

public/language/pt-PT/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Afixado",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Movido",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/ro/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/ru/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Прикреплена",
     "pinned-with-expiry": "Закреплен до %1",
     "scheduled": "Запланировано",
+    "deleted": "Deleted",
     "moved": "Перенесена",
     "moved-from": "Перенесено с %1",
     "copy-code": "Copy Code",

public/language/rw/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/sc/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pinned",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Moved",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/sk/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pripnuté",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Presunuté",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/sl/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Pripeto",
     "pinned-with-expiry": "Pripeto do %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Premaknjeno",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/sq-AL/topic.json

@@ -35,6 +35,7 @@
     "pinned": "E fiksuar",
     "pinned-with-expiry": "Fiksuar deri më %1",
     "scheduled": "E planifikuar",
+    "deleted": "Deleted",
     "moved": "E lëvizur",
     "moved-from": "E lëvizur nga %1",
     "copy-code": "Copy Code",

public/language/sr/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Закачено",
     "pinned-with-expiry": "Закачено до %1",
     "scheduled": "Планирано",
+    "deleted": "Deleted",
     "moved": "Премештено",
     "moved-from": "Премештено из %1",
     "copy-code": "Копирај код",

public/language/sv/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Fäst",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Flyttad",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/th/topic.json

@@ -35,6 +35,7 @@
     "pinned": "ถูกปักหมุด",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "ถูกย้าย",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/tr/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Sabitlendi",
     "pinned-with-expiry": "%1 tarihine kadar sabitlendi",
     "scheduled": "Konu Zamanlandı",
+    "deleted": "Deleted",
     "moved": "Taşındı",
     "moved-from": "Şuradan taşındı: %1",
     "copy-code": "Kodu kopyala",

public/language/uk/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Закріплена",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "Переміщена",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/language/vi/topic.json

@@ -35,6 +35,7 @@
     "pinned": "Đã ghim",
     "pinned-with-expiry": "Được ghim cho đến %1",
     "scheduled": "Lên kế hoạch",
+    "deleted": "Deleted",
     "moved": "Chuyển đi",
     "moved-from": "Đã chuyển từ %1",
     "copy-code": "Sao Chép Mã",

public/language/zh-CN/topic.json

@@ -35,6 +35,7 @@
     "pinned": "已固定",
     "pinned-with-expiry": "置顶直到 %1",
     "scheduled": "已定时",
+    "deleted": "Deleted",
     "moved": "已移动",
     "moved-from": "移自%1版",
     "copy-code": "复制代码",

public/language/zh-TW/topic.json

@@ -35,6 +35,7 @@
     "pinned": "已置頂",
     "pinned-with-expiry": "Pinned until %1",
     "scheduled": "Scheduled",
+    "deleted": "Deleted",
     "moved": "已移動",
     "moved-from": "Moved from %1",
     "copy-code": "Copy Code",

public/src/modules/helpers.common.js

@@ -302,6 +302,7 @@ module.exports = function (utils, Benchpress, relative_path) {
 			['title', userObj.username],
 			['data-uid', userObj.uid],
 			['loading', 'lazy'],
+			['aria-label', `User avatar for ${userObj.username}`],
 		]);
 		const styles = [`--avatar-size: ${size};`];
 		const attr2String = attributes => Array.from(attributes).reduce((output, [prop, value]) => {

src/categories/topics.js

@@ -167,6 +167,7 @@ module.exports = function (Categories) {
 				topic.slug = topic.tid;
 				topic.teaser = null;
 				topic.noAnchor = true;
+				topic.unread = false;
 				topic.tags = [];
 			}
 		});

src/plugins/hooks.js

@@ -176,7 +176,7 @@ Hooks.fire = async function (hook, params) {
 	const hookList = plugins.loadedHooks[hook];
 	const hookType = hook.split(':')[0];
 	if (global.env === 'development' && hook !== 'action:plugins.firehook' && hook !== 'filter:plugins.firehook') {
-		winston.verbose(`[plugins/fireHook] ${hook}`);
+		winston.debug(`[plugins/fireHook] ${hook}`);
 	}
 
 	if (!hookTypeToMethod[hookType]) {