engineering
/
cloudservices
3
0
Fork 1
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.libraryofcode.org/engineering/cloudservices

merge-requests/1/merge
Bsian 2019-12-16 22:42:39 +00:00
parent 2885bc4643 cb097067b5
commit 609ee3689e
No known key found for this signature in database
GPG Key ID: 097FB9A291026091
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/createaccount.ts
View File

@ -40,7 +40,7 @@ export default class CreateAccount extends Command {
const tempPass = this.client.util.randomPassword();
let passHash = await this.client.util.createHash(tempPass); passHash = passHash.replace(/[$]/g, '\\$').replace('\n', '');
const acctName = message.author.username.replace(/[!@#$%^&*(),.?":{}|<>]/g, '-').replace(/\s/g, '-');
const acctName = this.client.users.get(args[0]).username.replace(/[!@#$%^&*(),.?":{}|<>]/g, '-').replace(/\s/g, '-');
const etcPasswd = `${acctName},${args[0]},,`;
await this.client.util.createAccount(passHash, etcPasswd, args[2], args[0], args[1], message.author.id);

22
src/intervals/storage.ts
View File

@ -6,16 +6,18 @@ export default async function storage(client: Client) {
const main = async () => {
const accounts = await client.db.Account.find();
for (const account of accounts) {
const res = await client.util.exec(`du -bs /home/${account.username}`);
let bytes = Number(res.split('/')[0].replace('\t', ''));
try {
await fs.access(`/var/mail/${account.username}`, fs.constants.F_OK);
const res2 = await client.util.exec(`du -bs /var/mail/${account.username}`);
bytes += Number(res2.split('/')[0].replace('\t', ''));
} catch {
bytes += 0;
}
await client.redis.set(`storage-${account.username}`, bytes);
setTimeout(async () => {
const res = await client.util.exec(`du -bs /home/${account.username}`);
let bytes = Number(res.split('/')[0].replace('\t', ''));
try {
await fs.access(`/var/mail/${account.username}`, fs.constants.F_OK);
const res2 = await client.util.exec(`du -bs /var/mail/${account.username}`);
bytes += Number(res2.split('/')[0].replace('\t', ''));
} catch {
bytes += 0;
}
await client.redis.set(`storage-${account.username}`, bytes);
}, 600000);
}
};
await main();