Cleanup 1

src/commands/CommandHandler.ts

@@ -7,6 +7,7 @@ import { Prefix } from "./Prefix";
 import { createInventory, readInventory } from "../data/inventory";
 import { hasPermission } from "../permissions";
 import { Logger } from "../util/Logger";
+import { balanceConfig } from "../economy/Balance";
 
 export interface CommandMessage<T = unknown> {
 	m: "command";
@@ -77,7 +78,8 @@ export class CommandHandler {
 		if (!inventory) {
 			await createInventory({
 				userId: msg.p._id,
-				items: []
+				items: [],
+				balance: balanceConfig.defaultBalance || 0
 			});
 
 			inventory = await readInventory(msg.p._id);

src/commands/commands/economy/balance.ts

@@ -1,5 +1,4 @@
 import { formatBalance } from "../../../economy/Balance";
-import { Item, StackableItem } from "../../../economy/Item";
 import { Command } from "../../Command";
 
 export const balance = new Command(
@@ -7,7 +6,7 @@ export const balance = new Command(
 	["balance", "bal", "money"],
 	"get bozo's balance",
 	"balance",
-	(msg, agent) => {
+	msg => {
 		const bal = msg.inventory.balance;
 		return `Balance: ${formatBalance(bal)}`;
 	}

src/commands/commands/economy/inventory.ts

@@ -1,13 +1,12 @@
 import { Item, StackableItem } from "../../../economy/Item";
 import { Command } from "../../Command";
-import { CommandHandler } from "../../CommandHandler";
 
 export const inventory = new Command(
 	"inventory",
 	["inventory", "inv"],
 	"get bozo's inventory",
 	"inventory",
-	(msg, agent) => {
+	msg => {
 		const items = msg.inventory.items as unknown as Item[];
 		const list = items
 			.map(

src/commands/commands/fun/magic8ball.ts

@@ -3,26 +3,26 @@ import crypto from "crypto";
 
 // Possible answers
 const answers = [
-    "It is certain",
+	"It is certain",
-    "It is decidedly so",
+	"It is decidedly so",
-    "Without a doubt",
+	"Without a doubt",
-    "Yes, definitely",
+	"Yes, definitely",
-    "You may rely on it",
+	"You may rely on it",
-    "As I see it, yes",
+	"As I see it, yes",
-    "Most likely",
+	"Most likely",
-    "Outlook good",
+	"Outlook good",
-    "Yes",
+	"Yes",
-    "Signs point to yes",
+	"Signs point to yes",
-    "Reply hazy, try again",
+	"Reply hazy, try again",
-    "Ask again later",
+	"Ask again later",
-    "Better not tell you now",
+	"Better not tell you now",
-    "Cannot predict now",
+	"Cannot predict now",
-    "Concentrate and ask again",
+	"Concentrate and ask again",
-    `Don't count on it`,
+	`Don't count on it`,
-    "My reply is no",
+	"My reply is no",
-    "My sources say no",
+	"My sources say no",
-    "Outlook not so good",
+	"Outlook not so good",
-    "Very doubtful"
+	"Very doubtful"
 ];
 
 export const magic8ball = new Command(
@@ -30,37 +30,37 @@ export const magic8ball = new Command(
 	["magic8ball", "8ball", "8"],
 	"magic8ball bozo",
 	"magic8ball <question>",
-	(msg, agent) => {
+	msg => {
-        /**
+		/**
-         * Magic 8 ball command
+		 * Magic 8 ball command
-         * 
+		 *
-         * Returns a unique answer for every question asked.
+		 * Returns a unique answer for every question asked.
-         */
+		 */
 
-        // Check arguments
+		// Check arguments
-        // We're not checking for question marks since the user might think that's too much work
+		// We're not checking for question marks since the user might think that's too much work
-        if (!msg.argv[1]) return `🎱 Ask me a question, dummy`;
+		if (!msg.argv[1]) return `🎱 Ask me a question, dummy`;
 
-        // Hash the question (the user will get the same response for repeated questions)
+		// Hash the question (the user will get the same response for repeated questions)
-        // We use a predictable but unique salt (security by obscurity?)
+		// We use a predictable but unique salt (security by obscurity?)
-        const hash = crypto.createHash("sha-256");
+		const hash = crypto.createHash("sha-256");
-        hash.update("magic" + msg.argv[1] + "8ball");
+		hash.update("magic" + msg.argv[1] + "8ball");
 
-        // Use the question hash as the index
+		// Use the question hash as the index
-        const hex = hash.digest("hex");
+		const hex = hash.digest("hex");
-        let index = parseInt(hex[0] + hex[1] + hex[2], 16);
+		let index = parseInt(hex[0] + hex[1] + hex[2], 16);
 
-        // Make sure the index is within the bounds of the answers array
+		// Make sure the index is within the bounds of the answers array
-        while (index >= answers.length) {
+		while (index >= answers.length) {
-            index -= answers.length;
+			index -= answers.length;
-        }
+		}
 
-        while (index <= 0) {
+		while (index <= 0) {
-            index += answers.length;
+			index += answers.length;
-        }
+		}
 
-        // Answer the user's question
+		// Answer the user's question
-        let answer = answers[index];
+		let answer = answers[index];
-        return `🎱 ${answer}, ${msg.p.name}`;
+		return `🎱 ${answer}, ${msg.p.name}`;
 	}
 );

src/commands/commands/general/about.ts

@@ -5,7 +5,7 @@ export const about = new Command(
 	["about", "info"],
 	"get about bozo",
 	"about",
-	(msg, agent) => {
+	() => {
 		return `💫 This space bot was made by Hri7566.\n🚀 This bot is made possible by users like you. Thank you.\n🌌 Discord: @hri7566`;
 	}
 );

src/commands/commands/general/help.ts

@@ -7,7 +7,7 @@ export const help = new Command(
 	["help", "h", "commands", "cmds"],
 	"get help bozo",
 	"help [command]",
-	(msg, agent) => {
+	msg => {
 		if (msg.argv[1]) {
 			// Get command usage
 			let command: Command | undefined;

src/commands/commands/utility/color.ts

@@ -1,4 +1,3 @@
-import { MPPAgent } from "../../../services/mpp";
 import { CosmicColor } from "../../../util/CosmicColor";
 import { Command } from "../../Command";
 
@@ -7,7 +6,7 @@ export const color = new Command(
 	["color"],
 	"colors, bozo",
 	"color [<r> <g> <b> | <hex>]",
-	(msg, agent) => {
+	msg => {
 		if (msg.argv[3]) {
 			// test for rgb
 			try {

src/commands/commands/utility/cursor.ts

@@ -1,4 +1,4 @@
-import { MPPAgent } from "../../../services/mpp";
+import type { MPPAgent } from "../../../services/mpp";
 import { Command } from "../../Command";
 
 export const cursor = new Command(
@@ -7,7 +7,7 @@ export const cursor = new Command(
 	"set the cursor bozo",
 	"cursor <mode>",
 	(msg, agent) => {
-		if (!(agent as MPPAgent).client.isConnected) return;
+		if (agent.platform !== "mpp") return;
 		if (!msg.argv[1]) return "Specify a mode.";
 
 		const cursor = (agent as MPPAgent).cursor;

src/commands/commands/utility/math.ts

@@ -6,7 +6,7 @@ export const math = new Command(
 	["math"],
 	"math bozo",
 	"math <expression>",
-	(msg, agent) => {
+	msg => {
 		try {
 			const argcat = msg.argv.slice(1, msg.argv.length).join(" ");
 			const answer = evaluate(argcat);

src/commands/commands/utility/memory.ts

@@ -5,7 +5,7 @@ export const memory = new Command(
 	["memory", "mem"],
 	"get the memory bozo",
 	"memory",
-	(msg, agent) => {
+	() => {
 		return `${(process.memoryUsage().heapUsed / 1000 / 1000).toFixed(
 			2
 		)} MB used / ${(process.memoryUsage().heapTotal / 1000 / 1000).toFixed(

src/commands/commands/utility/role.ts

@@ -6,7 +6,7 @@ export const role = new Command(
 	["role"],
 	"get your role bozo",
 	"role",
-	(msg, agent) => {
+	msg => {
 		const role = getRole(msg.user.role);
 		if (!role) return `Your role: ${msg.user.role} (this role is broken)`;
 		return `Your role: ${role.displayName} [${msg.user.role}]`;

src/commands/commands/utility/uptime.ts

@@ -1,4 +1,3 @@
-import { MicroHandler } from "../../../services/console/MicroHandler";
 import { padNum } from "../../../util/Logger";
 import { Command } from "../../Command";
 

src/data/inventory.ts

@@ -1,4 +1,4 @@
-import { Inventory, Prisma, User } from "@prisma/client";
+import { Inventory } from "@prisma/client";
 import { prisma } from "./prisma";
 
 export async function createInventory(data: Omit<Inventory, "id">) {

src/data/user.ts

@@ -1,4 +1,4 @@
-import { Prisma, User } from "@prisma/client";
+import { User } from "@prisma/client";
 import { prisma } from "./prisma";
 
 export async function createUser(data: User) {

src/economy/Balance.ts

@@ -1,16 +1,17 @@
 import { loadConfig } from "../util/config";
 
-const config = loadConfig("config/balance.yml", {
+export const balanceConfig = loadConfig("config/balance.yml", {
 	symbol: " star bits",
 	after: true,
-	cutoff: 0
+	cutoff: 0,
+	defaultBalance: 0
 });
 
 export function formatBalance(
 	balance: number,
-	symbol: string = config.symbol,
+	symbol: string = balanceConfig.symbol,
-	after: boolean = config.after,
+	after: boolean = balanceConfig.after,
-	cutoff: number = config.cutoff
+	cutoff: number = balanceConfig.cutoff
 ) {
 	if (after) return `${balance.toFixed(cutoff)}${symbol}`;
 	else return `${symbol}${balance.toFixed(cutoff)}`;

src/services/console/index.ts

@@ -2,16 +2,11 @@ import {
 	BaseCommandMessage,
 	CommandHandler
 } from "../../commands/CommandHandler";
-import { loadConfig } from "../../util/config";
 import { ServiceAgent } from "../ServiceAgent";
 import readline from "readline";
 import { MicroHandler } from "./MicroHandler";
 import { Logger } from "../../util/Logger";
 
-const config = loadConfig("config/switchchat.yml", {
-	ownerOnly: false
-});
-
 export class ConsoleAgent extends ServiceAgent<readline.ReadLine> {
 	public desiredUser = {
 		name: "🟇 𝙎𝙪𝙥𝙚𝙧 Cosmic",

src/services/index.ts

@@ -1,9 +1,7 @@
-import EventEmitter from "events";
 import { MPPAgent } from "./mpp";
 import env from "../util/env";
 import { ServiceAgent } from "./ServiceAgent";
 import { loadConfig } from "../util/config";
-import { z } from "zod";
 import { SwitchChatAgent } from "./switchchat";
 import { ConsoleAgent } from "./console";
 

src/services/switchchat/index.ts

@@ -1,7 +1,6 @@
 import {
 	BaseCommandMessage,
-	CommandHandler,
+	CommandHandler
-	CommandMessage
 } from "../../commands/CommandHandler";
 import { loadConfig } from "../../util/config";
 import { ServiceAgent } from "../ServiceAgent";

src/util/config.ts

@@ -1,6 +1,5 @@
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { parse, stringify } from "yaml";
-import { z } from "zod";
 
 /**
  * Load a YAML config file and set default values if config path is nonexistent