From ce370aa97dba202763681bfd096344d7ad58fe6d Mon Sep 17 00:00:00 2001
From: Hri7566 <hri7566@gmail.com>
Date: Fri, 1 Dec 2023 23:44:04 -0500
Subject: [PATCH] Change command permissions and modify help to read
 permissions

---
 bun.lockb                               | Bin 16396 -> 16792 bytes
 config/roles.yml                        |   2 +-
 package.json                            |   1 +
 src/commands/commands/general/help.ts   |   8 ++++++++
 src/commands/commands/utility/cursor.ts |   3 +--
 src/commands/commands/utility/ic.ts     |  24 ++++++++++++++++++++++++
 src/commands/commands/utility/id.ts     |   4 +---
 src/commands/commands/utility/math.ts   |   1 -
 src/commands/commands/utility/memory.ts |   4 +---
 src/commands/commands/utility/msg.ts    |   6 ++----
 src/commands/commands/utility/role.ts   |   4 +---
 src/commands/index.ts                   |   3 ++-
 src/permissions/default.ts              |   3 +--
 src/services/console/MicroHandler.ts    |  18 ++++++++++++++++--
 14 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 src/commands/commands/utility/ic.ts

diff --git a/bun.lockb b/bun.lockb
index 41ad0ca6ce7232d8f896ddf1d0ec3d7d98d258df..18433abd50f50978d67b915f983ce8656861d905 100755
GIT binary patch
delta 2556
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
O@^WZ(yNBi*iN64Dr{*vK

delta 2411
zcmcImeQXp}5Z|}Guf6Ni>-Sx+*DDlSO55x8u9t#sZwu7GvG7L)IUow*!`P~oN<j*!
zcLp?V10swc_!Wg{l&A=vAt)i1#E=#!so!8E5fTz1k%UO1B@z71-d!aAVKC82W`8?x
z=FQH`dvD(E*($at#Pj~@ou>z9CBIm4C@{@pi$2=BV&8$)Kkcu2*8Q9LnU<X$?a~vP
zWKhknm`}bnZC77;!zv8eB`LA7H>I))Nm3y910BFqz-(a8x~|^tm6Eh<*O$fdrYuQP
zF?d6kq+DR{+SL#9{A^RoxT`1SYz%hnd<f%gpJPrry_}x6=7Cik9)xLk`r{e<IT)J&
z`|g$NJ0F6s(wdS>fC%QUgcC39c-$gM#lWjTj`kvuqdf~`{h2fl0oh@k_KGSY(TJ%3
zShmUXDT(HpBEm@nCQaN+BX|-iW=;NH&^&WQRMLQ1Gj}1}2<<R8i+4$}Xu?5JJlkmi
z&u3}GqM3g{qCpzXY8EbvS~anR2CSO04QaRFt0w9&HOZqUvfCn}grYXX0MC6iV$<Yr
z%w$(0h$^aRN(&-w#~eYqN|P9*5k(V?q}VmlM^U>bAF<M)JtAMX(n)(n%p=92Dg8D{
zYBT0^SexWw8x1-liW#fOAD1cD-Xvy{lC6o|6wTI@3(!QMkyxYnP^T~?C*@k2%!?qk
z(Wt#yyg*S^bI(LoH$jVqlbEp^3@WC*YL)z%gHEa(xiX<Sjs@mLHt2Rl@uVCuBQ}fS
zA}@{kKqf|ZUBCi}5hdldHO5^)CPwyClEzXX6EL26F(!B+vBNTBG=)5|9L(br!Ay)S
zPfBA25ap3-!Ay6K=~Ql?Ajq5Ji}Ppe!Hf-HroSVP{ZI9a8~NQq0XYUPq+$Qx)vwv`
z`!5Rlm%ULx??2WrIqsY+XhWV(op~ya=IO#r?)(_J@>O~=Ul&#yfiw)Mu0R(GZ7PUS
zUx7;JAvvhJFh)}gRoYRg3zg16It!__NEbOYP!yy7B9(rDluI*;V>G>3r8kOokx!Q)
z{S0Y=OBaRoiYrEYTq^wmshFbf7|nI7^r2f9ZW@R5JEZ$dbm5`>B{6!hL?zXu3okA8
z#At~}rDKqMq?E?UR;p5WsV*kcr;v_7@_KbqL0#S$b$XE>q$%VsLw;q*uS^$JGy-WD
zQk_p1)wIcn{CvpI7vDW`4JEQnN~UwWk{8Ms3R@!G5|hU(+63KK-kuz)aM<i~Yf^RJ
zRzsHB2x+x-C55RGsT#;<<Y3xlNi8j_tE3NVr>f`<+;5HjT|wt-D;D!X;?v8M`AG1t
z<}<+u(Fb;e`BZZ!;KNrA=F{u}b64PvR|Mt_+n+v6^XvG7@o5<1SgOF4;3?qAV0Ovo
zXk8LIq0u;a({Rk(v(Sa5TWLb_67CM;jB}VAUM2|+373TA1argUa5x1H7wOoIxOmV+
zx&Det95uI#jO(fC_e33DK%0YfkH3<;SaPG^C+J{(BevtE`cSwPk@0Ob7A{z{^vCPg
z0ugBq`vd-<q(g%=5}myVZr#Xvzso6>H$s7S(N7BkZcpYmR@SzhxYF_JQCU0{_6Nf-
zSVm6=-123aUJtnB8!{aZ1WPm5^wqDnK3@0Y(O+TR0B-?F8p|S6!+eoV9Sv@I$V68g
zT&0=IdGVo7!nRY7)yt`GhYaht8s?|$f~A?ewCLufyFdTv>*rwC<PU}r{TU0j1YM<>
z%Xjm-<jAaZ@0@@^L%`qY4@nm-)Dv`tGq?4eq2(`cDXdv13n=}Ks8r@Y@7l8b?c<kn
z_F`(l-^BSl=~&S1N&f&OHm|<&nyF(?5A;Dla>9n7YeBb&lOwdCfLE0N3T7ObJ=-a7
z-zkeRJ3SIAw+{z-VX#X=^ipUReHRLrT!$@oaAMo^@M+OE;pTMY%d}pjRgKr^+g4BV
QaCm})7KUfic-xzQ0x}AuQ2+n{

diff --git a/config/roles.yml b/config/roles.yml
index 4292148..558746f 100644
--- a/config/roles.yml
+++ b/config/roles.yml
@@ -7,7 +7,6 @@ NONE:
         - cosmic.command.color
         - cosmic.command.id
         - cosmic.command.math
-        - cosmic.command.memory
         - cosmic.command.role
 MODERATOR:
     displayName: Moderator
@@ -21,6 +20,7 @@ ADMINISTRATOR:
     inherits: MODERATOR
     permissions:
         - cosmic.commandGroup.*
+        - cosmic.command.ic
 OWNER:
     displayName: Owner
     permissions:
diff --git a/package.json b/package.json
index 13df48d..ee1dbc3 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "mpp-client-xt": "^1.3.1",
     "prisma": "^5.4.2",
     "switchchat": "^3.2.1",
+    "typescript": "^5.3.2",
     "yaml": "^2.3.3",
     "zod": "^3.22.4"
   }
diff --git a/src/commands/commands/general/help.ts b/src/commands/commands/general/help.ts
index 4a69bc2..81ae79c 100644
--- a/src/commands/commands/general/help.ts
+++ b/src/commands/commands/general/help.ts
@@ -1,3 +1,4 @@
+import { hasPermission } from "../../../permissions";
 import { Command } from "../../Command";
 import { CommandHandler } from "../../CommandHandler";
 
@@ -31,6 +32,13 @@ export const help = new Command(
 					commandGroup.commands
 						.map(command => {
 							if (!command.visible) return;
+							if (
+								!hasPermission(
+									msg.user.role,
+									`cosmic.command.${command.id}`
+								)
+							)
+								return;
 							return command.aliases[0];
 						})
 						.filter(val => {
diff --git a/src/commands/commands/utility/cursor.ts b/src/commands/commands/utility/cursor.ts
index 7575071..b79e247 100644
--- a/src/commands/commands/utility/cursor.ts
+++ b/src/commands/commands/utility/cursor.ts
@@ -12,6 +12,5 @@ export const cursor = new Command(
 
 		const cursor = (agent as MPPAgent).cursor;
 		cursor.props.currentAnimation = msg.argv[1];
-	},
-	false
+	}
 );
diff --git a/src/commands/commands/utility/ic.ts b/src/commands/commands/utility/ic.ts
new file mode 100644
index 0000000..a166ae3
--- /dev/null
+++ b/src/commands/commands/utility/ic.ts
@@ -0,0 +1,24 @@
+import { MicroHandler } from "../../../services/console/MicroHandler";
+import { Command } from "../../Command";
+
+export const ic = new Command(
+	"ic",
+	["ic"],
+	"use an internal command bozo",
+	"ic <command>",
+	async (msg, agent) => {
+		let argcat = msg.argv.slice(1, msg.argv.length).join(" ");
+		let args = argcat.split(" ");
+		return (await MicroHandler.handleMicroCommand(
+			{
+				m: "command",
+				a: argcat,
+				argc: args.length,
+				argv: args,
+				originalMessage: msg,
+				p: msg.p
+			},
+			agent
+		)) as string;
+	}
+);
diff --git a/src/commands/commands/utility/id.ts b/src/commands/commands/utility/id.ts
index a64f0ac..54d46ee 100644
--- a/src/commands/commands/utility/id.ts
+++ b/src/commands/commands/utility/id.ts
@@ -1,4 +1,3 @@
-import { MPPAgent } from "../../../services/mpp";
 import { Command } from "../../Command";
 
 export const id = new Command(
@@ -14,6 +13,5 @@ export const id = new Command(
 		} else {
 			return `Cosmic ID: \`${msg.p._id}\``;
 		}
-	},
-	false
+	}
 );
diff --git a/src/commands/commands/utility/math.ts b/src/commands/commands/utility/math.ts
index d675555..91c70ad 100644
--- a/src/commands/commands/utility/math.ts
+++ b/src/commands/commands/utility/math.ts
@@ -1,5 +1,4 @@
 import { Command } from "../../Command";
-
 import { evaluate } from "mathjs";
 
 export const math = new Command(
diff --git a/src/commands/commands/utility/memory.ts b/src/commands/commands/utility/memory.ts
index 6eba019..444e30c 100644
--- a/src/commands/commands/utility/memory.ts
+++ b/src/commands/commands/utility/memory.ts
@@ -1,4 +1,3 @@
-import { MPPAgent } from "../../../services/mpp";
 import { Command } from "../../Command";
 
 export const memory = new Command(
@@ -12,6 +11,5 @@ export const memory = new Command(
 		)} MB used / ${(process.memoryUsage().heapTotal / 1000 / 1000).toFixed(
 			2
 		)} MB total`;
-	},
-	false
+	}
 );
diff --git a/src/commands/commands/utility/msg.ts b/src/commands/commands/utility/msg.ts
index 0eaecca..8d09059 100644
--- a/src/commands/commands/utility/msg.ts
+++ b/src/commands/commands/utility/msg.ts
@@ -1,4 +1,3 @@
-import { MPPAgent } from "../../../services/mpp";
 import { Command } from "../../Command";
 
 export const msg = new Command(
@@ -7,8 +6,7 @@ export const msg = new Command(
 	"get your msg bozo",
 	"msg",
 	(msg, agent) => {
-		if (!(agent as MPPAgent).client.isConnected) return;
+		if (agent.platform !== "mpp") return;
 		return `${JSON.stringify(msg)}`;
-	},
-	false
+	}
 );
diff --git a/src/commands/commands/utility/role.ts b/src/commands/commands/utility/role.ts
index d02cb42..23da6a4 100644
--- a/src/commands/commands/utility/role.ts
+++ b/src/commands/commands/utility/role.ts
@@ -1,5 +1,4 @@
 import { getRole } from "../../../permissions";
-import { MPPAgent } from "../../../services/mpp";
 import { Command } from "../../Command";
 
 export const role = new Command(
@@ -11,6 +10,5 @@ export const role = new Command(
 		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}]`;
-	},
-	false
+	}
 );
diff --git a/src/commands/index.ts b/src/commands/index.ts
index 788487e..bff9427 100644
--- a/src/commands/index.ts
+++ b/src/commands/index.ts
@@ -11,6 +11,7 @@ import { cursor } from "./commands/utility/cursor";
 import { inventory } from "./commands/economy/inventory";
 import { color } from "./commands/utility/color";
 import { role } from "./commands/utility/role";
+import { ic } from "./commands/utility/ic";
 
 export function loadCommands() {
 	// cringe
@@ -27,6 +28,6 @@ export function loadCommands() {
 	CommandHandler.addCommandGroup(fun);
 
 	const utility = new CommandGroup("utility", "🔨 Utility");
-	utility.addCommands([math, memory, id, msg, cursor, color, role]);
+	utility.addCommands([math, memory, id, msg, cursor, color, role, ic]);
 	CommandHandler.addCommandGroup(utility);
 }
diff --git a/src/permissions/default.ts b/src/permissions/default.ts
index 1904f93..d455eab 100644
--- a/src/permissions/default.ts
+++ b/src/permissions/default.ts
@@ -14,7 +14,6 @@ export const defaultConfig = {
 			"cosmic.command.color",
 			"cosmic.command.id",
 			"cosmic.command.math",
-			"cosmic.command.memory",
 			"cosmic.command.role"
 		]
 	},
@@ -30,7 +29,7 @@ export const defaultConfig = {
 	ADMINISTRATOR: {
 		displayName: "Administrator",
 		inherits: "MODERATOR",
-		permissions: ["cosmic.commandGroup.*"]
+		permissions: ["cosmic.commandGroup.*", "cosmic.command.ic"]
 	},
 	OWNER: {
 		displayName: "Owner",
diff --git a/src/services/console/MicroHandler.ts b/src/services/console/MicroHandler.ts
index 20d7e23..6244333 100644
--- a/src/services/console/MicroHandler.ts
+++ b/src/services/console/MicroHandler.ts
@@ -55,7 +55,7 @@ export class MicroHandler {
 			case "commands":
 			case "cmds":
 			default:
-				return "Microcommands: /help | /js <expr> | /exit | /list | /view <index> | /unview | /admin+ <id>";
+				return "Microcommands: /help | /js <expr> | /exit | /list | /view <index> | /unview | /admin+ <id> | /admin- <id> | /owner+ <id>";
 				break;
 			case "js":
 			case "eval":
@@ -173,7 +173,6 @@ export class MicroHandler {
 					0,
 					6
 				)}...] an administrator`;
-
 				break;
 			case "admin-":
 				const userId2 = command.argv
@@ -190,7 +189,22 @@ export class MicroHandler {
 					0,
 					6
 				)}...] a normal user.`;
+				break;
+			case "owner+":
+				const userId3 = command.argv
+					.slice(1, command.argv.length)
+					.join(" ");
 
+				let user3 = await readUser(userId3);
+				if (!user3) return "No such user.";
+
+				user3.role = Role.OWNER;
+				await updateUser(user3);
+
+				return `Made user "${user3.name}" [${user3.platformId.substring(
+					0,
+					6
+				)}...] an owner`;
 				break;
 		}
 	}