Merge pull request #1807 from thelounge/astorije/users-commands

Do not load user commands or display them on `--help` if public mode or using LDAP

src/command-line/index.js

@@ -51,11 +51,9 @@ Helper.setHome(home);
 
 require("./start");
 require("./config");
-require("./list");
-require("./add");
-require("./remove");
-require("./reset");
-require("./edit");
+if (!Helper.config.public && !Helper.config.ldap.enable) {
+	require("./users");
+}
 require("./install");
 
 // TODO: Remove this when releasing The Lounge v3

src/command-line/users/add.js

@@ -3,8 +3,8 @@
 const colors = require("colors/safe");
 const program = require("commander");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("add <name>")
@@ -16,12 +16,7 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
-
-		if (Helper.config.public) {
-			log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
-		}
-
+		const ClientManager = require("../../clientManager");
 		const manager = new ClientManager();
 		const users = manager.getUsers();
 

src/command-line/users/edit.js

@@ -4,8 +4,8 @@ const program = require("commander");
 const child = require("child_process");
 const colors = require("colors/safe");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("edit <name>")
@@ -17,9 +17,8 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
-
-		var users = new ClientManager().getUsers();
+		const ClientManager = require("../../clientManager");
+		const users = new ClientManager().getUsers();
 
 		if (users === undefined) { // There was an error, already logged
 			return;

src/command-line/users/index.js

@@ -0,0 +1,7 @@
+"use strict";
+
+require("./list");
+require("./add");
+require("./remove");
+require("./reset");
+require("./edit");

src/command-line/users/list.js

@@ -3,8 +3,8 @@
 const colors = require("colors/safe");
 const program = require("commander");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("list")
@@ -16,13 +16,8 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
-
-		if (Helper.config.public) {
-			log.warn(`Users have no effect in ${colors.bold("public")} mode.`);
-		}
-
-		var users = new ClientManager().getUsers();
+		const ClientManager = require("../../clientManager");
+		const users = new ClientManager().getUsers();
 
 		if (users === undefined) { // There was an error, already logged
 			return;

src/command-line/users/remove.js

@@ -3,8 +3,8 @@
 const colors = require("colors/safe");
 const program = require("commander");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("remove <name>")
@@ -16,7 +16,7 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
+		const ClientManager = require("../../clientManager");
 		const manager = new ClientManager();
 
 		try {

src/command-line/users/reset.js

@@ -3,8 +3,8 @@
 const colors = require("colors/safe");
 const program = require("commander");
 const fs = require("fs");
-const Helper = require("../helper");
-const Utils = require("./utils");
+const Helper = require("../../helper");
+const Utils = require("../utils");
 
 program
 	.command("reset <name>")
@@ -16,9 +16,8 @@ program
 			return;
 		}
 
-		const ClientManager = require("../clientManager");
-
-		var users = new ClientManager().getUsers();
+		const ClientManager = require("../../clientManager");
+		const users = new ClientManager().getUsers();
 
 		if (users === undefined) { // There was an error, already logged
 			return;