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

install/package.json

@@ -146,7 +146,7 @@
         "webpack": "5.89.0",
         "webpack-merge": "5.10.0",
         "winston": "3.11.0",
-        "workerpool": "9.0.3",
+        "workerpool": "9.0.4",
         "xml": "1.0.1",
         "xregexp": "5.1.1",
         "yargs": "17.7.2",

public/language/nb/admin/settings/user.json

@@ -82,7 +82,7 @@
 	"categoryWatchState.tracking": "Tracking",
 	"categoryWatchState.notwatching": "Overvåker ikke",
 	"categoryWatchState.ignoring": "Ignorerer",
-	"restrictions-new": "New User Restrictions",
+	"restrictions-new": "Nye brukerbegrensninger ",
 	"restrictions.rep-threshold": "Reputation threshold before these restrictions are lifted",
 	"restrictions.seconds-between-new": "Seconds between posts for new users",
 	"restrictions.seconds-before-new": "Seconds before a new user can make their first post",

src/cli/index.js

@@ -114,7 +114,9 @@ if (!configExists && process.argv[2] !== 'setup') {
 	return;
 }
 
-process.env.CONFIG = configFile;
+if (configExists) {
+	process.env.CONFIG = configFile;
+}
 
 // running commands
 program