fix: copy fixes, rename upgrade script, disable federation on upgrades

public/language/en-GB/admin/settings/activitypub.json

@@ -7,7 +7,7 @@
 	"allowLoopback": "Allow loopback processing",
 	"allowLoopback-help": "Useful for debugging purposes only. You should probably leave this disabled.",
 
-	"servers": "Servers",
+	"server-filtering": "Filtering",
 	"count": "This NodeBB is currently aware of <strong>%1</strong> server(s)",
 	"server.filter-help": "Specify servers you would like to bar from federating with your NodeBB. Alternatively, you may opt to selectively <em>allow</em> federation with specific servers, instead. Both options are supported, although they are mutually exclusive.",
 	"server.filter-allow-list": "Use this as an Allow List instead"

src/upgrades/4.0.0/activitypub_setup.js

@@ -0,0 +1,17 @@
+'use strict';
+
+// const db = require('../../database');
+const meta = require('../../meta');
+
+module.exports = {
+	name: 'Setting up default configs/privileges re: ActivityPub',
+	timestamp: Date.UTC(2024, 1, 22),
+	method: async () => {
+		// Disable ActivityPub (upgraded installs have to opt-in to AP)
+		meta.configs.set('activitypubEnabled', 0);
+
+		// Set default privileges for world category
+		const install = require('../../install');
+		await install.giveWorldPrivileges();
+	},
+};

src/upgrades/4.0.0/assign_world_privileges.js

@@ -1,12 +0,0 @@
-'use strict';
-
-// const db = require('../../database');
-
-module.exports = {
-	name: 'Assigning default privileges to "World" pseudo-category',
-	timestamp: Date.UTC(2024, 1, 22),
-	method: async () => {
-		const install = require('../../install');
-		await install.giveWorldPrivileges();
-	},
-};

src/views/admin/settings/activitypub.tpl

@@ -25,12 +25,13 @@
 	</div>
 
 	<div class="row settings m-0">
-		<div class="col-sm-2 col-12 settings-header">[[admin/settings/activitypub:servers]]</div>
+		<div class="col-sm-2 col-12 settings-header">[[admin/settings/activitypub:server-filtering]]</div>
 		<div class="col-sm-10 col-12">
 			<form>
 				<div class="mb-3">
 					<p>[[admin/settings/activitypub:server.filter-help]]</p>
 					<p>[[admin/settings/activitypub:count, 0]]</p>
+					<p class="text-danger fst-italic small">This feature is not available yet</p>
 					<label for="activitypubFilterList" class="form-label">Filtering list</label>
 					<textarea class="form-control" id="activitypubFilterList" rows="10" disabled="disabled"></textarea>
 				</div>