Merge pull request 'master' (#1 ) from engineering/cloudservices:master into master

Reviewed-on: #1
fix auto tier
2024-10-14 02:34:48 -04:00 · 2024-01-08 20:43:29 -05:00 · 2024-01-08 20:35:11 -05:00 · 2024-01-08 20:34:30 -05:00 · 2024-01-08 20:32:32 -05:00 · 2024-01-07 13:51:40 -05:00
9 changed files with 117 additions and 106 deletions
--- a/src/class/AccountUtil.ts
+++ b/src/class/AccountUtil.ts
@ -41,13 +41,13 @@ export default class AccountUtil {
      subject: 'Approval for CS Account',
      html: `
      <body>
-        <style>* {font-family: 'Calibri';}</style>
+        <style>* {font-family: 'Calibri',sans-serif;}</style>
        <h1>Library of Code | Cloud Services</h1>
        <h2>Congratulations, your CS Account application has been approved. Welcome! Please see below for some details regarding your account and our services</h2>
        <p><b>Username:</b> ${data.username}</p>
        <p><b>Support Key:</b> ${code} || <i>You may be asked for this support key when contacting Library of Code, please keep the code in a safe area.</i></p>
-        <p><b>SSH Login:</b> <pre><code style="font-family: Courier;">ssh ${data.username}@cloud.libraryofcode.org</code></pre>
-        <p><b>Underwritten by:</b> ${moderatorMember.user.username}, ${find.pn.join(', ')}
+        <p><b>SSH Login:</b> <pre><code style="font-family: Courier,sans-serif;">ssh ${data.username}@cloud.libraryofcode.org</code></pre>
+        <p><b>Underwritten by:</b> ${moderatorMember.user.username}${find.isManager ? ' [k]' : ' '}</p>
        <h2>Useful information</h2>
        <h3>How to log in:</h3>
        <ol>
@ -76,16 +76,20 @@ export default class AccountUtil {
    const member = guild.members.cache.get(data.userID);
    await member.roles.add('546457886440685578');
    const user = this.client.users.cache.get(data.userID);
-    user.send('<:loc:607695848612167700> **Thank you for creating an account with us!** <:loc:607695848612167700>\n'
-    + `Please log into your account by running \`ssh ${data.username}@cloud.libraryofcode.org\` in your terminal, then use the password \`${tempPass}\` to log in.\n`
-    + `You will be asked to change your password, \`(current) UNIX password\` is \`${tempPass}\`, then create a password that is at least 12 characters long, with at least one number, special character, and an uppercase letter\n`
-    + 'Bear in mind that when you enter your password, it will be blank, so be careful not to type in your password incorrectly.\n\n'
-    + 'An email containing some useful information has also been sent.\n'
-    + `Your support key is \`${code}\`. Pin this message, you may need this key to contact Library of Code in the future.`).catch();
+    try {
+      await user.send('<:loc:607695848612167700> **Thank you for creating an account with us!** <:loc:607695848612167700>\n'
+          + `Please log into your account by running \`ssh ${data.username}@cloud.libraryofcode.org\` in your terminal, then use the password \`${tempPass}\` to log in.\n`
+          + `You will be asked to change your password, \`(current) UNIX password\` is \`${tempPass}\`, then create a password that is at least 12 characters long, with at least one number, special character, and an uppercase letter\n`
+          + 'Bear in mind that when you enter your password, it will be blank, so be careful not to type in your password incorrectly.\n\n'
+          + 'An email containing some useful information has also been sent.\n'
+          + `Your support key is \`${code}\`. Pin this message, you may need this key to contact Library of Code in the future.`);
+    } catch (error) {
+      this.client.util.handleError(error);
+    }
    return { account: accountInterface, tempPass };
  }

-  public async lock(username: string, moderatorID: string, data?: { reason?: string, time?: number}) {
+  public async lock(username: string, moderatorID: string, data?: { reason?: string, time?: number }) {
    const account = await this.client.db.Account.findOne({ username });
    if (!account) throw new Error('Account does not exist.');
    if (account.locked) throw new Error('Account is already locked.');
--- a/src/class/Util.ts
+++ b/src/class/Util.ts
@ -5,16 +5,22 @@ import axios from 'axios';
 import { randomBytes } from 'crypto';
 import childProcess from 'child_process';
 import nodemailer from 'nodemailer';
-import { Message, DMChannel, User, MessageEmbed, ColorResolvable, TextChannel } from 'discord.js';
+import { ColorResolvable, DMChannel, Message, MessageEmbed, TextChannel, User } from 'discord.js';
 import { v4 as uuid } from 'uuid';
 import moment from 'moment';
 import fs from 'fs';
 import hastebin from 'hastebin-gen';
 import { getUserByUid } from '../functions';
 import { AccountUtil, Client, Command, PaginationEmbed } from '.';
-import { ModerationInterface, AccountInterface } from '../models';
+import { AccountInterface, ModerationInterface } from '../models';
 import { Certificate } from '../../types/x509';

+enum TechnicianNameFormatOpt {
+  Full = 0,
+  Partial,
+  Basic
+}
+
 export default class Util {
  public client: Client;

@ -46,7 +52,7 @@ export default class Util {
      cmd.stdout.on('data', writeFunction);
      cmd.stderr.on('data', writeFunction);
      cmd.on('error', writeFunction);
-      cmd.once('close', (code, signal) => {
+      cmd.once('close', (code) => {
        cmd.stdout.off('data', writeFunction);
        cmd.stderr.off('data', writeFunction);
        cmd.off('error', writeFunction);
@ -184,16 +190,14 @@ export default class Util {
  }

  public async createHash(password: string): Promise<string> {
-    const hashed = await this.exec(`mkpasswd -m sha-512 "${password}"`);
-    return hashed;
+    return this.exec(`mkpasswd -m sha-512 "${password}"`);
  }

  public isValidEmail(email: string): boolean {
    const checkAt = email.indexOf('@');
    if (checkAt < 1) return false;
    const checkDomain = email.indexOf('.', checkAt + 2);
-    if (checkDomain < checkAt) return false;
-    return true;
+    return checkDomain >= checkAt;
  }

  public randomPassword(): string {
@ -276,7 +280,7 @@ export default class Util {
      } else date = null;
    }

-    const expiration = { date, processed };
+    const expiration: { date: Date; processed: boolean } = { date, processed };

    logInput.expiration = expiration;
    const log = new this.client.db.Moderation(logInput);
@ -290,8 +294,8 @@ export default class Util {
      case 0: archType = 'Technician'; embedTitle = 'Cloud Account | Create'; color = '#00ff00'; break;
      case 1: archType = 'Technician'; embedTitle = 'Account Warning | Warn'; color = '#ffff00'; break;
      case 2: archType = 'Technician'; embedTitle = 'Account Infraction | Lock'; color = '#ff6600'; break;
-      case 3: archType = 'Technician'; embedTitle = 'Account Reclaim | Unlock'; color = '#0099ff'; break;
-      case 4: archType = 'Director'; embedTitle = 'Cloud Account | Delete'; color = '#ff0000'; break;
+      case 3: archType = 'Technician'; embedTitle = 'Account Infraction | Unlock'; color = '#0099ff'; break;
+      case 4: archType = 'Manager'; embedTitle = 'Cloud Account | Delete'; color = '#ff0000'; break;
    }
    const req = await axios.get('https://loc.sh/int/directory');
    const find = req.data.find((mem) => mem.userID === moderator.id);
@ -299,7 +303,7 @@ export default class Util {
      .setTitle(embedTitle)
      .setColor(color)
      .addField('User', `${username} | <@${userID}>`, true)
-      .addField(archType, moderatorID === this.client.user.id ? 'SYSTEM' : `${moderator.username}, ${find.pn.join(', ')} (<@${moderatorID}>)`, true)
+      .addField(archType, moderatorID === this.client.user.id ? 'SYSTEM' : `${moderator.username}${find.isManager ? ' [k] ' : ' '}(<@${moderatorID}>)`, true)
      .setFooter(this.client.user.username, this.client.user.avatarURL())
      .setTimestamp();
    if (reason) embed.addField('Reason', reason || 'Not specified');
@ -311,13 +315,19 @@ export default class Util {
    return Promise.resolve(log);
  }

-  public async getTechnicianFullName(tech: User) {
-    if (!tech) throw new Error('\'tech\' is undefined.');
-    if (tech.id === this.client.user.id) return 'SYSTEM';
+  public async getTechnicianName(tech: User, format: TechnicianNameFormatOpt = TechnicianNameFormatOpt.Full) {
+    if (!tech) return 'SYSTEM (UT)';
+    if (tech.id === this.client.user.id) return 'SYSTEM (SELF)';

    const req = await axios.get('https://loc.sh/int/directory');
    const find = req.data.find((mem) => mem.userID === tech.id);
-    return `${tech.username}${find.isManager ? '[k]' : ''}${find.title ? ` (${find.title} / ${find.dept})` : ` (${find.dept})`} <<@${tech.id}>>`;
+    if (!find) return 'SYSTEM (UF)';
+    if (format === TechnicianNameFormatOpt.Full) {
+      return `${tech.username}${find.isManager ? ' [k]' : ''}${find.title ? ` (${find.title} / ${find.dept})` : ` (${find.dept})`} <<@${tech.id}>>`;
+    } else if (format === TechnicianNameFormatOpt.Partial) {
+      return `${tech.username}${find.isManager ? ' [k]' : ''}${find.title ? ` (${find.title})` : ` (${find.dept})`} <<@${tech.id}>>`;
+    }
+    return `${tech.username}${find.isManager ? ' [k]' : ''} <<@${tech.id}>>`;
  }

  public parseCertificate(pem: string) {
--- a/src/commands/cwg_create.ts
+++ b/src/commands/cwg_create.ts
@ -84,7 +84,7 @@ export default class CWG_Create extends Command {
        .setTitle('Domain Creation')
        .setColor(3066993)
        .addField('Account Username', `${account.username} | <@${account.userID}>`, true)
-        .addField('Technician', await this.client.util.getTechnicianFullName(message.author), true)
+        .addField('Technician', await this.client.util.getTechnicianName(message.author), true)
        .addField('Domain', domain.domain, true)
        .addField('Port', String(domain.port), true);

--- a/src/commands/cwg_delete.ts
+++ b/src/commands/cwg_delete.ts
@ -23,7 +23,7 @@ export default class CWG_Delete extends Command {
      const embed = new MessageEmbed();
      embed.setTitle('Domain Deletion');
      embed.addField('Account Username', `${domain.account.username} | <@${domain.account.userID}>`, true);
-      embed.addField('Technician', await this.client.util.getTechnicianFullName(message.author), true);
+      embed.addField('Technician', await this.client.util.getTechnicianName(message.author), true);
      embed.addField('Domain', domain.domain, true);
      embed.addField('Port', String(domain.port), true);
      embed.setFooter(this.client.user.username, this.client.user.avatarURL());
--- a/src/commands/notify.ts
+++ b/src/commands/notify.ts
@ -30,7 +30,7 @@ export default class Notify extends Command {
      embed.addField('User', `${account.username} | <@${account.userID}>`, true);
      const req = await axios.get('https://loc.sh/int/directory');
      const technician = req.data.find((mem) => mem.userID === message.author.id);
-      embed.addField('Technician', message.author.id === this.client.user.id ? 'SYSTEM' : `${message.author.username}, ${technician.pn.join(', ')} (<@${message.author.id}>)`, true);
+      embed.addField('Technician', message.author.id === this.client.user.id ? 'SYSTEM' : `${message.author.username}${technician.isManager ? ' [k] ' : ' '}(<@${message.author.id}>)`, true);
      const ch = this.client.channels.cache.get('580950455581147146') as TextChannel;
      ch.send({ embeds: [embed] });
      this.client.util.transport.sendMail({
--- a/src/commands/resetpassword.ts
+++ b/src/commands/resetpassword.ts
@ -31,8 +31,7 @@ export default class ResetPassword extends Command {
      + `You will be asked to change your password when you log back in, \`(current) UNIX password\` is \`${tempPass}@\`, then create a password that is at least 12 characters long, with at least one number, special character, and an uppercase letter.\n`
      + 'Bear in mind that when you enter your password, it will be blank, so be careful not to type in your password incorrectly.');
      } catch (error) {
-        if (error.code === 50007) completeMessage += '\n*Unable to DM user*';
-        throw error;
+        completeMessage += '\n*Unable to DM user*';
      }
      return msg.edit(completeMessage);
    } catch (error) {
--- a/src/commands/tier.ts
+++ b/src/commands/tier.ts
@ -18,8 +18,8 @@ export default class Tier extends Command {
      const account = await this.client.db.Account.findOne({ $or: [{ username: args[0] }, { userID: args[0].replace(/[<@!>]/gi, '') }] });
      if (!account) return edit.edit(`***${this.client.stores.emojis.error} Cannot find user.***`);
      if (account.root) return edit.edit(`***${this.client.stores.emojis.error} Permission denied.***`);
-      if (Number.isNaN(Number(args[1]))) return edit.edit(`***${this.client.stores.emojis.error} The tier you provided is not a valid number. It should be between 1 and 3.***`);
-      if (Number(args[1]) > 3 || Number(args[1]) < 1) return edit.edit(`***${this.client.stores.emojis.error} You can only choose a Tier between 1 and 3.***`);
+      if (Number.isNaN(Number(args[1]))) return edit.edit(`***${this.client.stores.emojis.error} The tier you provided is not a valid number. It should be between 0 and 3.***`);
+      if (Number(args[1]) > 3 || Number(args[1]) < 0) return edit.edit(`***${this.client.stores.emojis.error} You can only choose a Tier between 0 and 3.***`);
      message.delete();
      const tier = await this.client.db.Tier.findOne({ id: Number(args[1]) });
      if (account.ramLimitNotification !== -1) {
@ -32,7 +32,7 @@ export default class Tier extends Command {
      embed.setTitle('Cloud Account | Tier Change');
      embed.setColor('#0099ff');
      embed.addField('User', `${account.username} | <@${account.userID}>`, true);
-      embed.addField('Technician', await this.client.util.getTechnicianFullName(message.author), true);
+      embed.addField('Technician', await this.client.util.getTechnicianName(message.author), true);
      embed.addField('Old Tier -> New Tier', `${account.tier} -> ${args[1]}`, true);
      embed.setFooter(this.client.user.username, this.client.user.avatarURL());
      embed.setTimestamp();
--- a/src/commands/whois.ts
+++ b/src/commands/whois.ts
@ -46,7 +46,7 @@ export default class Whois extends Command {
      if (account.locked) details += '__This account is currently locked.__\n';
      switch (true) {
        case account.permissions.director:
-          details += 'This account belongs to a Director.\n';
+          details += 'This account belongs to a Manager.\n';
          role = await message.member.guild.roles.fetch('662163685439045632');
          break;
        case account.permissions.technician:
@ -61,11 +61,12 @@ export default class Whois extends Command {
          role = await message.member.guild.roles.fetch(message.member.guild.id);
          break;
      }
-      if (account.root) details += '**This account has root/administrative privileges.**\n';
+      if (account.root) details += '**This account has administrative privileges.**\n';
      embed.setColor(role.color || 0x36393f);
      if (details) embed.addField('Additional Details', details, true);

      embed.setTimestamp();
+      embed.setFooter('Library of Code | Cloud Services', message.guild.iconURL());
      return message.channel.send({ embeds: [embed] });
    } catch (error) {
      return this.client.util.handleError(error, message, this);
@ -83,15 +84,13 @@ export default class Whois extends Command {
    const finger = !member.roles.cache.has('662163685439045632') ? fingerInformation.replace(this.IP_REGEX, '[MASKED IP ADDRESS]') : fingerInformation;

    embed.setDescription(`${finger}\n${chage}`);
-    embed.addField('Username', `${account.username} | <@${account.userID}>`, true);
-    embed.addField('ID', account.userID, true);
+    embed.addField('Username', `${account.username} <<@${account.userID}>>`, true);
+    embed.addField('Discord ID', account.userID, true);
    embed.addField('Email Address', account.emailAddress, true);
    embed.addField('Tier', String(account.tier), true);
    embed.addField('Support Key', account.supportKey, true);
    embed.addField('Referral Code & Total', `${account.referralCode} | ${account.totalReferrals}`, true);
-    embed.addField('Created By', await this.client.users.fetch(account.createdBy)
-      ? (await this.client.users.fetch(account.createdBy)).toString()
-      : 'SYSTEM', true);
+    embed.addField('Created By', (await this.client.util.getTechnicianName(await this.client.users.fetch(account.createdBy))), true);
    embed.addField('Created At', moment(account.createdAt).format('dddd, MMMM Do YYYY, h:mm:ss A'), true);
    embed.addField('CPU Usage', `${cpuUsage.split('\n')[0] || '0'}%`, true);
    embed.addField('Memory', dataConversion(Number(memory) * 1000), true);
@ -105,12 +104,11 @@ export default class Whois extends Command {
      this.client.util.exec(`memory ${account.username}`),
    ]);

-    embed.addField('Username', `${account.username} | <@${account.userID}>`, true);
-    embed.addField('ID', account.userID, true);
+    embed.setDescription('*CPU Usage and Memory are fetched in real-time, storage information is cached.*');
+    embed.addField('Username', `${account.username}  <<@${account.userID}>>`, true);
+    embed.addField('Discord ID', account.userID, true);
    embed.addField('Tier', String(account.tier), true);
-    embed.addField('Created By', await this.client.users.fetch(account.createdBy)
-      ? (await this.client.users.fetch(account.createdBy)).toString()
-      : 'SYSTEM', true);
+    embed.addField('Created By', (await this.client.util.getTechnicianName(await this.client.users.fetch(account.createdBy), 2)), true);
    embed.addField('Created At', moment(account.createdAt).format('dddd, MMMM Do YYYY, h:mm:ss A'), true);
    embed.addField('CPU Usage', `${cpuUsage.split('\n')[0] || '0'}%`, true);
    embed.addField('Memory', dataConversion(Number(memory) * 1000), true);
--- a/src/intervals/checkStaffStatus.ts
+++ b/src/intervals/checkStaffStatus.ts
@ -52,7 +52,7 @@ export default function checkStaffStatus(client: Client) {
        await client.db.Account.updateOne({ username: acc.username }, { $set: { 'permissions.intern': false } });
      }

-      if ((acc.permissions.staff || acc.permissions.intern || acc.permissions.technician || acc.permissions.director || user.roles.cache.has('858049948401401866')) && acc.tier < 3) {
+      if ((acc.permissions.staff || acc.permissions.intern || acc.permissions.technician || acc.permissions.director || user.roles.cache.has('858049948401401866')) && (acc.tier < 3 && acc.tier > 0)) {
        await client.db.Account.updateOne({ username: acc.username }, { $set: { tier: 3 } });
        const embed = new MessageEmbed();
        embed.setTitle('Cloud Account | Tier Change');
Author	SHA1	Message	Date
pax	17b567b00f	Merge pull request 'master' (#1 ) from engineering/cloudservices:master into master Reviewed-on: #1	2024-10-14 02:34:48 -04:00
Matthew	309f080b37	fix auto tier	2024-01-08 20:43:29 -05:00
Matthew	64f67c9a18	fix auto tier	2024-01-08 20:35:11 -05:00
Matthew	c283487b5a	fix auto tier	2024-01-08 20:34:30 -05:00
Matthew	9ecc9f1324	qol changes for Util.ts	2024-01-08 20:32:32 -05:00
Matthew	2a9492ccbb	prettify whois	2024-01-07 13:51:40 -05:00
Matthew	7337f77027	fix attempt x3	2024-01-07 13:45:25 -05:00
Matthew	a2e9a87e69	fix attempt	2024-01-07 13:40:04 -05:00
Matthew	e653484be4	update technician name formatting function	2024-01-07 13:29:57 -05:00
Matthew	276467519f	qol changes for Util.ts	2024-01-06 19:10:42 -05:00
Matthew	77e50b61c5	fix css in AccountUtil.ts (p2)	2024-01-06 19:08:18 -05:00
Matthew	60683688ce	fix css in AccountUtil.ts	2024-01-06 19:06:53 -05:00
Matthew	3d930792fe	various improvements to handling modlogs	2024-01-06 19:06:44 -05:00
Matthew	9d9485700a	fix dm issue with createAccount func	2024-01-06 19:03:02 -05:00
Matthew	88e2273f5f	fix dm issue with resetpassword.ts	2024-01-06 19:01:40 -05:00
Matthew	f231cc4fdd	fix .join() in various commands	2023-11-14 17:58:50 -05:00
Matthew	b6da450c94	fix .join() in notify	2023-10-31 18:48:39 -04:00
Matthew	81f58cab27	Merge remote-tracking branch 'origin/master'	2023-10-31 18:20:46 -04:00
Matthew	a36b579a9c	try to fix issue with Util's .join() func	2023-10-31 18:19:55 -04:00
Matthew	9ce84fb89b	Merge pull request 'add pax to sudoers' (#15 ) from pax/cloudservices:master into master Reviewed-on: engineering/cloudservices#15	2023-10-22 08:17:44 -04:00