From 2e53e63345a1918235501fc479b7edefcb80df35 Mon Sep 17 00:00:00 2001 From: ENGO150 Date: Fri, 31 Jan 2025 17:04:53 +0100 Subject: [PATCH] changed codes to shorter forms also rename PM codes to DM codes but I already staged it and i am too lazy to redo it --- include/chat/flags.h | 26 +++++++++++++------------- src/chat/main/client.c | 2 +- src/chat/misc.c | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/chat/flags.h b/include/chat/flags.h index 46458b3..1dc851e 100644 --- a/include/chat/flags.h +++ b/include/chat/flags.h @@ -42,21 +42,21 @@ enum WHY2_CHAT_SERVER_TYPE //TYPE OF SERVER #define WHY2_INVALID_POINTER (void*) 0xffffffffffffffff //(SERVER -> CLIENT) CODES -#define WHY2_CHAT_CODE_ACCEPT_MESSAGES "code_000" //TELL CLIENT THEY CAN SEND MESSAGES -#define WHY2_CHAT_CODE_PICK_USERNAME "code_001" //TELL CLIENT TO PICK USERNAME -#define WHY2_CHAT_CODE_SERVER_SIDE_QUIT_COMMUNICATION "code_002" //TELL CLIENT TO END COMMUNICATION (just so they don't get segfault on server-side disconnect) -#define WHY2_CHAT_CODE_INVALID_USERNAME "code_003" //haha -#define WHY2_CHAT_CODE_LIST_SERVER "code_004" //SAME AS WHY2_CHAT_CODE_LIST BUT BACK TO THE CLIENT -#define WHY2_CHAT_CODE_VERSION_SERVER "code_005" //SAME AS WHY2_CHAT_CODE_VERSION BUT BACK TO THE CLIENT -#define WHY2_CHAT_CODE_PM_SERVER "code_006" //SAME AS WHY2_CHAT_CODE_PM BUT BACK TO THE CLIENT -#define WHY2_CHAT_CODE_ENTER_PASSWORD "code_007" //RECEIVE PASSWORD FROM USER -#define WHY2_CHAT_CODE_INVALID_PASSWORD "code_008"//🌸ꗥ～ꗥ🌸 𝐢 𝐡𝐚𝐭𝐞 𝐲𝐨𝐮 🌸ꗥ～ꗥ🌸 +#define WHY2_CHAT_CODE_ACCEPT_MESSAGES "SC0" //TELL CLIENT THEY CAN SEND MESSAGES +#define WHY2_CHAT_CODE_PICK_USERNAME "SC1" //TELL CLIENT TO PICK USERNAME +#define WHY2_CHAT_CODE_SERVER_SIDE_QUIT_COMMUNICATION "SC2" //TELL CLIENT TO END COMMUNICATION (just so they don't get segfault on server-side disconnect) +#define WHY2_CHAT_CODE_INVALID_USERNAME "SC3" //haha +#define WHY2_CHAT_CODE_LIST_SERVER "SC4" //SAME AS WHY2_CHAT_CODE_LIST BUT BACK TO THE CLIENT +#define WHY2_CHAT_CODE_VERSION_SERVER "SC5" //SAME AS WHY2_CHAT_CODE_VERSION BUT BACK TO THE CLIENT +#define WHY2_CHAT_CODE_DM_SERVER "SC6" //SAME AS WHY2_CHAT_CODE_DM BUT BACK TO THE CLIENT +#define WHY2_CHAT_CODE_ENTER_PASSWORD "SC7" //RECEIVE PASSWORD FROM USER +#define WHY2_CHAT_CODE_INVALID_PASSWORD "SC8"//🌸ꗥ～ꗥ🌸 𝐢 𝐡𝐚𝐭𝐞 𝐲𝐨𝐮 🌸ꗥ～ꗥ🌸 //(CLIENT -> SERVER) CODES -#define WHY2_CHAT_CODE_EXIT "code_999" //TELL SERVER YOU ARE ENDING COMMUNICATION -#define WHY2_CHAT_CODE_LIST "code_998" //TELL SERVER TO GIVE YOU ALL CONNECTED USERS -#define WHY2_CHAT_CODE_PM "code_997" //TELL SERVER TO SEND MESSAGE ONLY TO SPECIFIC ID -#define WHY2_CHAT_CODE_VERSION "code_996" //TELL SERVER TO GIVE YOU ITS VERSION +#define WHY2_CHAT_CODE_EXIT "CS1" //TELL SERVER YOU ARE ENDING COMMUNICATION +#define WHY2_CHAT_CODE_LIST "CS2" //TELL SERVER TO GIVE YOU ALL CONNECTED USERS +#define WHY2_CHAT_CODE_DM "CS3" //TELL SERVER TO SEND MESSAGE ONLY TO SPECIFIC ID +#define WHY2_CHAT_CODE_VERSION "CS4" //TELL SERVER TO GIVE YOU ITS VERSION //COMMANDS #define WHY2_CHAT_COMMAND_PREFIX "!" //the little thingy you write before the command names to make the program recognise them boy. You know? Like in minecraft you use /kill... Also, are you dumb? diff --git a/src/chat/main/client.c b/src/chat/main/client.c index 8687f66..3b9f20b 100644 --- a/src/chat/main/client.c +++ b/src/chat/main/client.c @@ -244,7 +244,7 @@ int main(void) char *final_message = why2_malloc(strlen(id) + strlen(msg) + 2); sprintf(final_message, "%s;%s%c", id, msg, '\0'); - why2_send_socket_code(final_message, NULL, listen_socket, WHY2_CHAT_CODE_PM); //SEND + why2_send_socket_code(final_message, NULL, listen_socket, WHY2_CHAT_CODE_DM); //SEND //DEALLOCATION why2_deallocate(id); diff --git a/src/chat/misc.c b/src/chat/misc.c index 1f8b1bf..31eaf51 100644 --- a/src/chat/misc.c +++ b/src/chat/misc.c @@ -765,7 +765,7 @@ void *why2_communicate_thread(void *arg) //DEALLOCATION why2_deallocate(message); - } else if (strcmp(decoded_code_buffer, WHY2_CHAT_CODE_PM) == 0 && decoded_buffer != NULL && strlen(decoded_buffer) != 0) //PM + } else if (strcmp(decoded_code_buffer, WHY2_CHAT_CODE_DM) == 0 && decoded_buffer != NULL && strlen(decoded_buffer) != 0) //PM { char *id = NULL; //RECEIVER char *msg; @@ -814,8 +814,8 @@ void *why2_communicate_thread(void *arg) why2_bool self_pm = pm_connection_node.connection == connection; //SEND YOU DUMB FUCK - send_socket_code_deallocate(private_msg, why2_chat_server_config("server_username"), pm_connection_node.connection, WHY2_CHAT_CODE_PM_SERVER); //RECIPIENT - if (!self_pm) send_socket_code_deallocate(private_msg, why2_chat_server_config("server_username"), connection, WHY2_CHAT_CODE_PM_SERVER); //AUTHOR + send_socket_code_deallocate(private_msg, why2_chat_server_config("server_username"), pm_connection_node.connection, WHY2_CHAT_CODE_DM_SERVER); //RECIPIENT + if (!self_pm) send_socket_code_deallocate(private_msg, why2_chat_server_config("server_username"), connection, WHY2_CHAT_CODE_DM_SERVER); //AUTHOR why2_deallocate(private_msg); } @@ -1055,7 +1055,7 @@ void *why2_listen_server(void *socket) { printf("Server is outdated. Some new features may not work correctly.\n\n"); } - } else if (strcmp(code, WHY2_CHAT_CODE_PM_SERVER) == 0) + } else if (strcmp(code, WHY2_CHAT_CODE_DM_SERVER) == 0) { printf(WHY2_CLEAR_AND_GO_UP WHY2_CLEAR_AND_GO_UP); //do not fucking ask me how the fucking formatting fucking works, i dont fucking know