deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-21 06:55:12 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Do not load user commands or display them on `--help` if public mode or using LDAP
This commit is contained in:
Jérémie Astori 2017-12-10 14:24:55 -05:00 committed by GitHub
parent 4e6a29db35 c21aee3d4a
commit c0869b05a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/command-line/index.js
View file

@ -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

11
src/command-line/add.js → src/command-line/users/add.js
View file

@ -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();

9
src/command-line/edit.js → src/command-line/users/edit.js
View file

@ -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;

7
src/command-line/users/index.js Normal file
View file

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

13
src/command-line/list.js → src/command-line/users/list.js
View file

@ -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;

6
src/command-line/remove.js → src/command-line/users/remove.js
View file

@ -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 {

9
src/command-line/reset.js → src/command-line/users/reset.js
View file

@ -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;