.github/workflows/why2-chat-build.yml

@@ -64,13 +64,13 @@ jobs:
         run: make build_chat
 
       - name: Upload Client
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: WHY2 Chat Client
           path: ${{ matrix.client }}
 
       - name: Upload Server
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: WHY2 Chat Server
           path: ${{ matrix.server }}

include/chat/flags.h

@@ -52,9 +52,8 @@ enum WHY2_CHAT_SERVER_TYPE //TYPE OF SERVER
 #define WHY2_CHAT_CODE_LIST_SERVER "SC5" //SAME AS WHY2_CHAT_CODE_LIST BUT BACK TO THE CLIENT
 #define WHY2_CHAT_CODE_VERSION_SERVER "SC6" //SAME AS WHY2_CHAT_CODE_VERSION BUT BACK TO THE CLIENT
 #define WHY2_CHAT_CODE_DM_SERVER "SC7" //SAME AS WHY2_CHAT_CODE_DM BUT BACK TO THE CLIENT
-#define WHY2_CHAT_CODE_REGISTER "SC8" //RECEIVE PASSWORD FROM USER (REGISTER)
-#define WHY2_CHAT_CODE_LOGIN "SC9" //RECEIVE PASSWORD FROM USER (LOGIN)
-#define WHY2_CHAT_CODE_INVALID_PASSWORD "SCA"//🌸ꗥ～ꗥ🌸 𝐢 𝐡𝐚𝐭𝐞 𝐲𝐨𝐮 🌸ꗥ～ꗥ🌸
+#define WHY2_CHAT_CODE_ENTER_PASSWORD "SC8" //RECEIVE PASSWORD FROM USER
+#define WHY2_CHAT_CODE_INVALID_PASSWORD "SC9"//🌸ꗥ～ꗥ🌸 𝐢 𝐡𝐚𝐭𝐞 𝐲𝐨𝐮 🌸ꗥ～ꗥ🌸
 
 //(CLIENT -> SERVER) CODES
 #define WHY2_CHAT_CODE_CLIENT_SERVER_KEY_EXCHANGE "CS0" //TELL SERVER YOU ARE SHARING YOUR PUBLIC KEY

src/chat/config/client.toml

@@ -17,4 +17,4 @@
 auto_connect = false # Automatic connection to 'auto_connect_ip'
 auto_connect_ip = "chat.coquette.baby" # See 'auto_connect'
 
-authority_ip = "chat.coquette.baby" # CA Address; Feel free to change if you don't trust the developer, but be aware that both client and server must use the same CA
+authority_ip = "ca.chat.coquette.baby" # CA Address; Feel free to change if you don't trust the developer, but be aware that both client and server must use the same CA

src/chat/misc.c

@@ -873,7 +873,7 @@ void *why2_communicate_thread(void *arg)
             char *user_config_path = why2_get_server_users_path();
             if (!why2_toml_contains(user_config_path, decoded_buffer)) //REGISTRATION
             {
-                send_socket_code_deallocate(NULL, why2_chat_server_config("server_username"), client_server_key, connection, WHY2_CHAT_CODE_REGISTER);
+                send_socket_code_deallocate(NULL, why2_chat_server_config("server_username"), client_server_key, connection, WHY2_CHAT_CODE_ENTER_PASSWORD);
 
                 //KEEP READING UNTIL CODE ARRIVES
                 char *code = NULL;
@@ -902,7 +902,7 @@ void *why2_communicate_thread(void *arg)
                 why2_toml_write(user_config_path, username, password); //SAVE PASSWORD
             } else //LOGIN
             {
-                send_socket_code_deallocate(NULL, why2_chat_server_config("server_username"), client_server_key, connection, WHY2_CHAT_CODE_LOGIN);
+                send_socket_code_deallocate(NULL, why2_chat_server_config("server_username"), client_server_key, connection, WHY2_CHAT_CODE_ENTER_PASSWORD);
 
                 unsigned char max_tries = (unsigned char) server_config_int("max_password_tries");
 
@@ -1352,9 +1352,6 @@ void *why2_listen_server(void *socket)
     unsigned char asking_username = 0;
     unsigned char asking_password = 0;
     char *server_uname = NULL;
-    why2_bool bool_buffer_1 = 0;
-    why2_bool bool_buffer_2 = 0;
-    why2_bool bool_buffer_3 = 0;
 
     //CONTENT
     char *username = NULL;
@@ -1409,11 +1406,11 @@ void *why2_listen_server(void *socket)
 
                 pthread_cancel(getline_thread); //CANCEL CLIENT getline
                 exiting = 1; //EXIT THIS THREAD
-            } else if (strcmp(code, WHY2_CHAT_CODE_PICK_USERNAME) == 0 || (bool_buffer_1 = (strcmp(code, WHY2_CHAT_CODE_INVALID_USERNAME) == 0))) //PICK USERNAME (COULD BE CAUSE BY INVALID USERNAME)
+            } else if (strcmp(code, WHY2_CHAT_CODE_PICK_USERNAME) == 0 || strcmp(code, WHY2_CHAT_CODE_INVALID_USERNAME) == 0) //PICK USERNAME (COULD BE CAUSE BY INVALID USERNAME)
             {
                 __why2_set_asking_username(1);
 
-                if (bool_buffer_1) //INVALID USERNAME
+                if (strcmp(code, WHY2_CHAT_CODE_INVALID_USERNAME) == 0) //INVALID USERNAME
                 {
                     printf(WHY2_CLEAR_AND_GO_UP WHY2_CLEAR_AND_GO_UP "%s\nInvalid username!\n\n\n", asking_username > 1 ? WHY2_CLEAR_AND_GO_UP : "");
                     fflush(stdout);
@@ -1496,17 +1493,17 @@ void *why2_listen_server(void *socket)
                     why2_deallocate(pm_info[i]);
                 }
                 why2_deallocate(pm_info);
-            } else if ((bool_buffer_1 = (strcmp(code, WHY2_CHAT_CODE_REGISTER) == 0)) || (bool_buffer_2 = (strcmp(code, WHY2_CHAT_CODE_LOGIN) == 0)) || (bool_buffer_3 = (strcmp(code, WHY2_CHAT_CODE_INVALID_PASSWORD) == 0))) //PICK USERNAME (COULD BE CAUSE BY INVALID USERNAME)
+            } else if (strcmp(code, WHY2_CHAT_CODE_ENTER_PASSWORD) == 0 || strcmp(code, WHY2_CHAT_CODE_INVALID_PASSWORD) == 0) //PICK USERNAME (COULD BE CAUSE BY INVALID USERNAME)
             {
                 __why2_set_asking_password(1);
 
-                if (bool_buffer_3) //INVALID USERNAME
+                if (strcmp(code, WHY2_CHAT_CODE_INVALID_PASSWORD) == 0) //INVALID USERNAME
                 {
                     printf(WHY2_CLEAR_AND_GO_UP WHY2_CLEAR_AND_GO_UP "%s\nInvalid password!\n\n\n", asking_password > 1 ? WHY2_CLEAR_AND_GO_UP : "");
                     fflush(stdout);
                 }
 
-                printf("%s%s\nEnter password:%s\n", asking_password++ > 0 ? WHY2_CLEAR_AND_GO_UP : "", WHY2_CLEAR_AND_GO_UP WHY2_CLEAR_AND_GO_UP, bool_buffer_1 ? " (REGISTER)" : (bool_buffer_2 ? " (LOGIN)" : ""));
+                printf("%s%s\nEnter password:\n", asking_password++ > 0 ? WHY2_CLEAR_AND_GO_UP : "", WHY2_CLEAR_AND_GO_UP WHY2_CLEAR_AND_GO_UP);
                 fflush(stdout);
                 //TODO! THIS SOMEHOW BREAKS THE CLIENT INPUT
             }