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

Improvements to code

merge-requests/1/merge
Bsian 2019-10-26 19:32:56 +01:00
parent 851af0f0bf
commit 3b3fcf2513
No known key found for this signature in database
GPG Key ID: 097FB9A291026091
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/commands/cwg.ts
View File

@ -55,15 +55,15 @@ export default class CWG extends Command {
<h1>Library of Code sp-us | Cloud Services</h1> <h1>Library of Code sp-us | Cloud Services</h1>
<p>Hello, this is an email informing you that a new domain under your account has been binded. <p>Hello, this is an email informing you that a new domain under your account has been binded.
Information is below.</p> Information is below.</p>
<strong>Domain:</strong> ${domain.domain} <b>Domain:</b> ${domain.domain}
<strong>Port:</strong> ${domain.port} <b>Port:</b> ${domain.port}
<strong>Certificate Issuer:</strong> ${cert.issuer.organizationName} <b>Certificate Issuer:</b> ${cert.issuer.organizationName}
<strong>Certificate Subject:</strong> ${cert.subject.commonName} <b>Certificate Subject:</b> ${cert.subject.commonName}
<strong>Responsible Engineer:</strong> ${message.author.username}#${message.author.discriminator} <b>Responsible Engineer:</b> ${message.author.username}#${message.author.discriminator}
If you have any questions about additional setup, you can reply to this email or send a message in #cloud-support in our Discord server. If you have any questions about additional setup, you can reply to this email or send a message in #cloud-support in our Discord server.
<strong><i>Library of Code sp-us | Support Team</i></strong> <b><i>Library of Code sp-us | Support Team</i></b>
`, `,
}); });
if (!domain.domain.includes('cloud.libraryofcode.org')) { if (!domain.domain.includes('cloud.libraryofcode.org')) {

22
src/commands/lock.ts
View File

@ -18,22 +18,20 @@ export default class Lock extends Command {
try { try {
const account = await this.client.db.Account.findOne({ $or: [{ account: args[0] }, { userID: args[0].replace(/[<@!>]/gi, '') }] }); const account = await this.client.db.Account.findOne({ $or: [{ account: args[0] }, { userID: args[0].replace(/[<@!>]/gi, '') }] });
if (!account) return message.channel.createMessage(`***${this.client.stores.emojis.error} Cannot find user.***`); if (!account) return message.channel.createMessage(`***${this.client.stores.emojis.error} Cannot find user.***`);
if (account.locked) return message.channel.createMessage(`***${this.client.stores.emojis.error} This account is already locked.***`);
const edit = await message.channel.createMessage(`***${this.client.stores.emojis.loading} Locking account...***`); const edit = await message.channel.createMessage(`***${this.client.stores.emojis.loading} Locking account...***`);
if (account.locked) return edit.edit(`***${this.client.stores.emojis.error} This account is already locked.***`);
if (account.username === 'matthew' || account.root) return edit.edit(`***${this.client.stores.emojis.error} Permission denied.***`); if (account.username === 'matthew' || account.root) return edit.edit(`***${this.client.stores.emojis.error} Permission denied.***`);
await this.client.util.exec(`lock ${account.username}`); await this.client.util.exec(`lock ${account.username}`);
await account.update({ locked: true }); await account.update({ locked: true });
const expiry = new Date(); const expiry = new Date();
const lockLength = args[1].match(/[a-z]+|[^a-z]+/gi);
// @ts-ignore // @ts-ignore
const momentMilliseconds = moment.duration(Number(args[1].split('')[0]), args[1].split('')[1]).asMilliseconds; const momentMilliseconds = moment.duration(Number(lockLength[0]), lockLength[1]).asMilliseconds;
expiry.setMilliseconds(momentMilliseconds); expiry.setMilliseconds(momentMilliseconds);
let processed: boolean; let processed: boolean = false;
if (momentMilliseconds) { if (!momentMilliseconds) processed = true;
processed = false;
} else {
processed = true;
}
const moderation = new this.client.db.Moderation({ const moderation = new this.client.db.Moderation({
username: account.username, username: account.username,
userID: account.userID, userID: account.userID,
@ -71,11 +69,11 @@ export default class Lock extends Command {
html: ` html: `
<h1>Library of Code | Cloud Services</h1> <h1>Library of Code | Cloud Services</h1>
<p>Your Cloud Account has been locked until ${momentMilliseconds ? moment(expiry).calendar() : 'indefinitely'} under the EULA.</p> <p>Your Cloud Account has been locked until ${momentMilliseconds ? moment(expiry).calendar() : 'indefinitely'} under the EULA.</p>
<p><strong>Reason:</strong> ${momentMilliseconds ? args.slice(2).join(' ') : args.slice(1).join(' ')}</p> <p><b>Reason:</b> ${momentMilliseconds ? args.slice(2).join(' ') : args.slice(1).join(' ')}</p>
<p><strong>Supervisor:</strong> ${message.author.username}</p> <p><b>Supervisor:</b> ${message.author.username}</p>
<p><strong>Expiration:</strong> ${momentMilliseconds ? moment(expiry).format('dddd, MMMM Do YYYY, h:mm:ss A') : 'N/A'}</p> <p><b>Expiration:</b> ${momentMilliseconds ? moment(expiry).format('dddd, MMMM Do YYYY, h:mm:ss A') : 'N/A'}</p>
<strong><i>Library of Code sp-us | Support Team</i></strong> <b><i>Library of Code sp-us | Support Team</i></b>
`, `,
}); });
} catch (error) { } catch (error) {

3
src/commands/unlock.ts
View File

@ -1,5 +1,4 @@
import uuid from 'uuid/v4'; import uuid from 'uuid/v4';
import moment from 'moment';
import { Message } from 'eris'; import { Message } from 'eris';
import { Client } from '..'; import { Client } from '..';
import { Command, RichEmbed } from '../class'; import { Command, RichEmbed } from '../class';
@ -17,8 +16,8 @@ export default class Unlock extends Command {
try { try {
const account = await this.client.db.Account.findOne({ $or: [{ account: args[0] }, { userID: args[0].replace(/[<@!>]/gi, '') }] }); const account = await this.client.db.Account.findOne({ $or: [{ account: args[0] }, { userID: args[0].replace(/[<@!>]/gi, '') }] });
if (!account) return message.channel.createMessage(`***${this.client.stores.emojis.error} Cannot find user.***`); if (!account) return message.channel.createMessage(`***${this.client.stores.emojis.error} Cannot find user.***`);
if (!account.locked) return message.channel.createMessage(`***${this.client.stores.emojis.error} This account is already unlocked.***`);
const edit = await message.channel.createMessage(`***${this.client.stores.emojis.loading} Unlocking account...***`); const edit = await message.channel.createMessage(`***${this.client.stores.emojis.loading} Unlocking account...***`);
if (!account.locked) return edit.edit(`***${this.client.stores.emojis.error} This account is already unlocked.***`);
if (account.username === 'matthew' || account.root) return edit.edit(`***${this.client.stores.emojis.error} Permission denied.***`); if (account.username === 'matthew' || account.root) return edit.edit(`***${this.client.stores.emojis.error} Permission denied.***`);
await this.client.util.exec(`unlock ${account.username}`); await this.client.util.exec(`unlock ${account.username}`);