Removed duplicate utils file

src/Client.ts

@@ -3,10 +3,10 @@ import mongoose from 'mongoose';
 import signale from 'signale';
 import fs from 'fs-extra';
 import path from 'path';
-import { config } from '.';
+import { config, Util } from '.';
 import { Account, AccountInterface, Moderation, ModerationInterface, Domain, DomainInterface } from './models';
 import { emojis } from './stores';
-import { Command, Util } from './class';
+import { Command } from './class';
 
 
 export default class Client extends Eris.Client {

src/Util.ts

@@ -93,4 +93,23 @@ export default class Util {
     }
     return arrayString;
   }
+
+  public async createHash(password: string) {
+    const hashed = await this.exec(`mkpasswd -m sha-512 "${password}"`);
+    return hashed;
+  }
+
+  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;
+  }
+
+  public randomPassword(): string {
+    let tempPass = ''; const passChars = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0'];
+    tempPass += passChars[Math.floor(Math.random() * passChars.length)];
+    return tempPass;
+  }
 }

src/class/Util.ts

@@ -1,96 +0,0 @@
-/* eslint-disable no-param-reassign */
-import { promisify, isArray } from 'util';
-import childProcess from 'child_process';
-import nodemailer from 'nodemailer';
-import { Message, PrivateChannel } from 'eris';
-import { outputFile } from 'fs-extra';
-import { Client } from '..';
-import { Command, RichEmbed } from '.';
-
-export default class Util {
-  public client: Client;
-
-  public transport: nodemailer.Transporter;
-
-  constructor(client: Client) {
-    this.client = client;
-    this.transport = nodemailer.createTransport({
-      host: 'staff.libraryofcode.org',
-      auth: { user: 'support', pass: this.client.config.emailPass },
-    });
-  }
-
-  public async exec(command: string): Promise<string> {
-    const ex = promisify(childProcess.exec);
-    let result: string;
-    // eslint-disable-next-line no-useless-catch
-    try {
-      const res = await ex(command);
-      result = res.stderr || res.stdout;
-    } catch (err) {
-      throw err;
-    }
-    return result;
-  }
-
-  public resolveCommand(command: string): Command {
-    if (this.client.commands.has(command)) return this.client.commands.get(command);
-    for (const cmd of this.client.commands.values()) {
-      if (!cmd.aliases) continue;// eslint-disable-line no-continue
-      for (const alias of cmd.aliases) {
-        if (command === alias.toLowerCase()) return cmd;
-      }
-    }
-    return undefined;
-  }
-
-  public async handleError(error: Error, message?: Message, command?: Command): Promise<void> {
-    const info = { content: `\`\`\`js\n${error.stack}\n\`\`\``, embed: null };
-    if (message) {
-      const embed = new RichEmbed();
-      embed.setColor('FF0000');
-      embed.setAuthor(`Error caused by ${message.author.username}#${message.author.discriminator}`, message.author.avatarURL);
-      embed.setTitle('Message content');
-      embed.setDescription(message.content);
-      embed.addField('User', `${message.author.mention} (\`${message.author.id}\`)`, true);
-      embed.addField('Channel', message.channel.mention, true);
-      let guild: string;
-      if (message.channel instanceof PrivateChannel) guild = '@me';
-      else guild = message.channel.guild.id;
-      embed.addField('Message link', `[Click here](https://discordapp.com/channels/${guild}/${message.channel.id}/${message.id})`, true);
-      embed.setTimestamp(new Date(message.timestamp));
-      info.embed = embed;
-    }
-    await this.client.createMessage('595788220764127272', info);
-    if (message) this.client.createMessage('595788220764127272', 'Message content for above error');
-    if (command) this.client.commands.get(command.name).enabled = false;
-    if (message) message.channel.createMessage(`***${this.client.stores.emojis.error} An unexpected error has occured - please contact a member of the Engineering Team.${command ? ' This command has been disabled.' : ''}***`);
-  }
-
-  public splitFields(fields: {name: string, value: string, inline?: boolean}[]): {name: string, value: string, inline?: boolean}[][] {
-    let index = 0;
-    const array: {name: string, value: string, inline?: boolean}[][] = [[]];
-    while (fields.length) {
-      if (array[index].length >= 25) { index += 1; array[index] = []; }
-      array[index].push(fields[0]); fields.shift();
-    }
-    return array;
-  }
-
-  public splitString(string: string, length: number): string[] {
-    if (!string) return [];
-    if (Array.isArray(string)) string = string.join('\n');
-    if (string.length <= length) return [string];
-    const arrayString: string[] = [];
-    let str: string = '';
-    let pos: number;
-    while (string.length > 0) {
-      pos = string.length > length ? string.lastIndexOf('\n', length) : outputFile.length;
-      if (pos > length) pos = length;
-      str = string.substr(0, pos);
-      string = string.substr(pos);
-      arrayString.push(str);
-    }
-    return arrayString;
-  }
-}

src/index.ts

@@ -5,3 +5,4 @@ export { default as Commands } from './commands';
 export { default as Events } from './events';
 export { default as Models } from './models';
 export { default as Stores } from './stores';
+export { default as Util } from './Util';