diff --git a/install/package.json b/install/package.json index 07b8dc8501..0385337da9 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.2", "nodebb-rewards-essentials": "1.0.0", - "nodebb-theme-harmony": "2.0.0-pre.18", + "nodebb-theme-harmony": "2.0.0-pre.19", "nodebb-theme-lavender": "7.1.8", "nodebb-theme-peace": "2.2.4", "nodebb-theme-persona": "13.3.18", diff --git a/public/language/en-GB/activitypub.json b/public/language/en-GB/activitypub.json index 82f562a812..54fa13b6e3 100644 --- a/public/language/en-GB/activitypub.json +++ b/public/language/en-GB/activitypub.json @@ -1,9 +1,18 @@ { "world.name": "World", - "world.description": "This forum is federated, and can interact with the social web (or \"fediverse\"). Your corner of the fediverse consists of topics created by — and shared from — from users you follow.", - "world.popular": "Popular topics from the past day", + "world.description": "", + "world.popular": "Popular topics", + "world.recent": "All topics", + "world.help": "Help", "no-topics": "This forum doesn't know of any other topics yet.", + "help.title": "What is this page?", + "help.intro": "Welcome to your corner of the fediverse.", + "help.fediverse": "The \"fediverse\" is a network of interconnected applications and websites that all talk to one another and whose users can see each other. This forum is federated, and can interact with that social web (or \"fediverse\"). This page is your corner of the fediverse. It consists solely of topics created by — and shared from — users you follow.", + "help.build": "There might not be a lot of topics here to start; that's normal. You will start to see more content here over time when you start following other users.", + "help.federating": "Likewise, if users from outside of this forum start following you, then your posts will start appearing on those apps and websites as well.", + "help.next-generation": "This is the next generation of social media, start contributing today!", + "topic-event-announce-ago": "%1 shared this post %3", "topic-event-announce-on": "%1 shared this post on %3" } \ No newline at end of file diff --git a/public/src/client/world.js b/public/src/client/world.js index 8ab38a02c1..84ed411d26 100644 --- a/public/src/client/world.js +++ b/public/src/client/world.js @@ -1,6 +1,6 @@ 'use strict'; -define('forum/world', ['topicList', 'sort', 'hooks', 'alerts', 'api'], function (topicList, sort, hooks, alerts, api) { +define('forum/world', ['topicList', 'sort', 'hooks', 'alerts', 'api', 'bootbox'], function (topicList, sort, hooks, alerts, api, bootbox) { const World = {}; World.init = function () { @@ -10,6 +10,7 @@ define('forum/world', ['topicList', 'sort', 'hooks', 'alerts', 'api'], function sort.handleSort('categoryTopicSort', 'world'); handleIgnoreWatch(-1); + handleHelp(); hooks.fire('action:topics.loaded', { topics: ajaxify.data.topics }); hooks.fire('action:category.loaded', { cid: ajaxify.data.cid }); @@ -42,5 +43,28 @@ define('forum/world', ['topicList', 'sort', 'hooks', 'alerts', 'api'], function }); } + function handleHelp() { + const trigger = document.getElementById('world-help'); + if (!trigger) { + return; + } + + const content = [ + '
[[activitypub:help.intro]]
', + '[[activitypub:help.fediverse]]
', + '[[activitypub:help.build]]
', + '[[activitypub:help.federating]]
', + '[[activitypub:help.next-generation]]
', + ]; + + trigger.addEventListener('click', () => { + bootbox.dialog({ + title: '[[activitypub:help.title]]', + message: content.join('\n'), + size: 'large', + }); + }); + } + return World; }); diff --git a/src/categories/data.js b/src/categories/data.js index 9173e9ae9c..452ccf20b8 100644 --- a/src/categories/data.js +++ b/src/categories/data.js @@ -16,7 +16,7 @@ const intFields = [ const worldCategory = { cid: -1, name: 'Uncategorized', - description: 'Pseudo-category containing topics that do not strictly fit in with any existing categories', + description: 'Topics that do not strictly fit in with any existing categories', icon: 'fa-globe', imageClass: 'cover', bgColor: '#eee', diff --git a/src/controllers/activitypub/topics.js b/src/controllers/activitypub/topics.js index 7022ba5ae9..d8ea8dd00e 100644 --- a/src/controllers/activitypub/topics.js +++ b/src/controllers/activitypub/topics.js @@ -68,8 +68,6 @@ controller.list = async function (req, res) { targetUid: targetUid, }); data.name = '[[activitypub:world.name]]'; - data.description = '[[activitypub:world.description]]'; - data.descriptionParsed = data.description; delete data.children; data.topicCount = await db.sortedSetIntersectCard(sets);