From 98193bac956c834d315bc16faf13ba9bb112ae81 Mon Sep 17 00:00:00 2001
From: EmeraldLockdown <86802223+EmeraldLoc@users.noreply.github.com>
Date: Tue, 10 Mar 2026 16:44:11 -0500
Subject: [PATCH] Send reason over command packet

---
 src/pc/chat_commands.c                      |  7 ++-----
 src/pc/network/packets/packet.h             |  2 +-
 src/pc/network/packets/packet_command_mod.c | 22 ++++++++++++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/pc/chat_commands.c b/src/pc/chat_commands.c
index 9646182bb..11fdaeb05 100644
--- a/src/pc/chat_commands.c
+++ b/src/pc/chat_commands.c
@@ -68,7 +68,7 @@ bool exec_chat_command(char* command) {
                     network_send_kick(np->localIndex, EKT_KICKED, reason);
                     network_player_disconnected(np->localIndex);
                 } else {
-                    network_send_chat_command(np->globalIndex, CCC_KICK);
+                    network_send_chat_command(np->globalIndex, CCC_KICK, reason);
                 }
                 return true;
             }
@@ -79,11 +79,10 @@ bool exec_chat_command(char* command) {
                 if (gNetworkType == NT_SERVER) {
                     network_send_kick(np->localIndex, EKT_BANNED, reason);
 
-                    // TODO: Moderation: Allow you to insert a reason
                     moderation_list_add(MODERATION_LIST_TYPE_BAN, np->localIndex, reason, false);
                     network_player_disconnected(np->localIndex);
                 } else {
-                    network_send_chat_command(np->globalIndex, CCC_BAN);
+                    network_send_chat_command(np->globalIndex, CCC_BAN, reason);
                 }
                 return true;
             }
@@ -91,7 +90,6 @@ bool exec_chat_command(char* command) {
         if (gNetworkType == NT_SERVER && ccc == CCC_PERMBAN) {
             chat_construct_player_message(np, DLANG(CHAT, PERM_BANNING));
             network_send_kick(np->localIndex, EKT_BANNED, reason);
-            // TODO: Moderation: Allow you to insert a reason
             moderation_list_add(MODERATION_LIST_TYPE_BAN, np->localIndex, reason, true);
             network_player_disconnected(np->localIndex);
             return true;
@@ -100,7 +98,6 @@ bool exec_chat_command(char* command) {
             chat_construct_player_message(np, DLANG(CHAT, ADD_MODERATOR));
             np->moderator = true;
             network_send_moderator(np->localIndex);
-            // TODO: Moderation: Allow you to insert a reason
             moderation_list_add(MODERATION_LIST_TYPE_MODERATOR, np->localIndex, reason, true);
             return true;
         }
diff --git a/src/pc/network/packets/packet.h b/src/pc/network/packets/packet.h
index 56b48e07d..c72418119 100644
--- a/src/pc/network/packets/packet.h
+++ b/src/pc/network/packets/packet.h
@@ -243,7 +243,7 @@ void network_send_kick(u8 localIndex, enum KickReasonType kickReason, char* reas
 void network_receive_kick(struct Packet* p);
 
 // packet_command_mod.c
-void network_send_chat_command(u8 localIndex, enum ChatConfirmCommand CCC);
+void network_send_chat_command(u8 localIndex, enum ChatConfirmCommand CCC, char* reason);
 void network_receive_chat_command(struct Packet* p);
 
 // packet_moderator.c
diff --git a/src/pc/network/packets/packet_command_mod.c b/src/pc/network/packets/packet_command_mod.c
index 55acf9e14..628b15a93 100644
--- a/src/pc/network/packets/packet_command_mod.c
+++ b/src/pc/network/packets/packet_command_mod.c
@@ -5,7 +5,7 @@
 #include "pc/network/moderation.h"
 #include "pc/debuglog.h"
 
-void network_send_chat_command(u8 globalIndex, enum ChatConfirmCommand ccc) {
+void network_send_chat_command(u8 globalIndex, enum ChatConfirmCommand ccc, char* reason) {
     if (!gNetworkPlayers[0].moderator) return;
 
     u8 cccType = ccc; struct Packet p = { 0 };
@@ -13,6 +13,14 @@ void network_send_chat_command(u8 globalIndex, enum ChatConfirmCommand ccc) {
     packet_init(&p, PACKET_COMMAND, false, PLMT_NONE);
     packet_write(&p, &globalIndex, sizeof(u8));
     packet_write(&p, &cccType, sizeof(u8));
+    u16 reasonLength = 0;
+    if (reason) {
+        u16 reasonLength = strlen(reason);
+        packet_write(&p, &reasonLength, sizeof(u16));
+        packet_write(&p, reason, sizeof(u8) * reasonLength);
+    } else {
+        packet_write(&p, &reasonLength, sizeof(u16));
+    }
     network_send_to(gNetworkPlayerServer->localIndex, &p);
 }
 
@@ -27,8 +35,13 @@ void network_receive_chat_command(struct Packet *p) {
         return;
     }
     u8 CCC; u8 player;
+    u16 reasonLength = 0;
+    char reason[MAX_REASON_LENGTH] = { 0 };
     packet_read(p, &player, sizeof(u8));
     packet_read(p, &CCC, sizeof(u8));
+    packet_read(p, &reasonLength, sizeof(u16));
+    if (reasonLength >= MAX_REASON_LENGTH) reasonLength = MAX_REASON_LENGTH - 1;
+    packet_read(p, reason, sizeof(u8) * reasonLength);
 
     if (CCC != CCC_KICK && CCC != CCC_BAN) {
         LOG_ERROR("recieved an invalid chat command: %d", CCC);
@@ -42,13 +55,12 @@ void network_receive_chat_command(struct Packet *p) {
     }
     char message[256] = { 0 };
     if (CCC == CCC_KICK) {
-        network_send_kick(np->localIndex, EKT_KICKED, NULL);
+        network_send_kick(np->localIndex, EKT_KICKED, reason);
         snprintf(message, 256, "\\#fff982\\Kicked '%s%s\\#fff982\\'!", network_get_player_text_color_string(np->localIndex), np->name);
     }
     if (CCC == CCC_BAN) {
-        network_send_kick(np->localIndex, EKT_BANNED, NULL);
-        // TODO: Moderation: Allow you to insert a reason
-        moderation_list_add(MODERATION_LIST_TYPE_BAN, np->localIndex, "", false);
+        network_send_kick(np->localIndex, EKT_BANNED, reason);
+        moderation_list_add(MODERATION_LIST_TYPE_BAN, np->localIndex, reason, false);
         snprintf(message, 256, "\\#fff982\\Banned '%s%s\\#fff982\\'!", network_get_player_text_color_string(np->localIndex), np->name);
     }
     network_player_disconnected(np->globalIndex);