refactor: whole code to not use pointers

src/server/client.c

@@ -23,7 +23,7 @@ void client_init(client_t *client, int fd)
     memset(client, 0, sizeof *client);
     client->fd = fd;
     client->buffer[0] = '\0';
-    client->user = NULL;
+    uuid_clear(client->user);
     DEBUG_MSG("Client connected");
 }
 

src/server/cmds/cmd_info.c

@@ -16,64 +16,70 @@
 #include "ressources_infos.h"
 #include "server.h"
 
-static void info_team(client_t *client)
+static void info_team(server_t *server, client_t *client)
 {
     team_info_t info = {0};
+    team_t *team = get_team_by_uuid(server, client->team);
 
     dprintf(client->fd, "211");
     fsync(client->fd);
-    write(client->fd, team_to_info(client->team, &info), sizeof(info));
+    write(client->fd, team_to_info(team, &info), sizeof info);
 }
 
-static void info_channel(client_t *client)
+static void info_channel(server_t *server, client_t *client)
 {
     channel_info_t info = {0};
+    team_t *team = get_team_by_uuid(server, client->team);
+    channel_t *channel = get_channel_by_uuid(team, client->channel);
 
     dprintf(client->fd, "212");
     fsync(client->fd);
-    write(client->fd, channel_to_info(client->channel, &info), sizeof(info));
+    write(client->fd, channel_to_info(channel, &info), sizeof info);
 }
 
-static void info_thread(client_t *client)
+static void info_thread(server_t *server, client_t *client)
 {
     thread_info_t info = {0};
+    team_t *team = get_team_by_uuid(server, client->team);
+    channel_t *channel = get_channel_by_uuid(team, client->channel);
+    thread_t *thread = get_thread_by_uuid(channel, client->thread);
 
     dprintf(client->fd, "213");
     fsync(client->fd);
-    write(client->fd, thread_to_info(client->thread, &info), sizeof(info));
+    write(client->fd, thread_to_info(thread, &info), sizeof info);
 }
 
-static void info_user(client_t *client)
+static void info_user(server_t *server, client_t *client)
 {
     user_info_t info = {0};
+    user_t *user = get_user_by_uuid(server, client->user);
+    team_t *team = get_team_by_uuid(server, client->team);
 
     printf("send user info\n");
     dprintf(client->fd, "215");
     fsync(client->fd);
-    write(
-        client->fd, user_to_info(client->user, &info, client->team),
-        sizeof(info));
+    write(client->fd, user_to_info(user, &info, team), sizeof info);
 }
 
 void cmd_info(server_t *server, client_t *client)
 {
     if (!server || !client || !is_logged_in(client) || !check_context(client))
         return;
-    if (!client->team) {
-        info_user(client);
+    if (uuid_is_null(client->team)) {
+        info_user(server, client);
         return;
     }
-    if (!user_in_team(client->user->uuid, client->team)) {
+    if (!user_in_team(client->user, get_team_by_uuid(server, client->team))) {
         dprintf(client->fd, "520");
         return;
     }
-    if (!client->channel) {
-        info_team(client);
+    if (uuid_is_null(client->channel)) {
+        info_team(server, client);
         return;
     }
-    if (!client->thread) {
-        info_channel(client);
+    if (uuid_is_null(client->thread)) {
+        info_channel(server, client);
         return;
     }
-    info_thread(client);
+    info_thread(server, client);
 }

src/server/cmds/cmd_list.c

@@ -22,76 +22,73 @@ static void list_teams(server_t *server, client_t *client)
 
     dprintf(client->fd, "221");
     fsync(client->fd);
-    write(client->fd, &server->teams.size, sizeof(server->teams.size));
-    for (size_t i = 0; i < server->teams.size; i++) {
-        write(
-            client->fd, team_to_info(&server->teams.arr[i], &info),
-            sizeof(team_info_t));
-    }
+    WRITE(client->fd, server->teams.size);
+    for (size_t i = 0; i < server->teams.size; i++)
+        WRITE(client->fd, *team_to_info(&server->teams.arr[i], &info));
 }
 
-static void list_channels(client_t *client, team_t *team)
+static void list_channels(server_t *server, client_t *client)
 {
+    team_t *team = get_team_by_uuid(server, client->team);
     channel_info_t info = {0};
 
+    if (team == NULL)
+        return;
     dprintf(client->fd, "222");
     fsync(client->fd);
-    write(client->fd, &team->channels.size, sizeof(team->channels.size));
-    for (size_t i = 0; i < team->channels.size; i++) {
-        write(
-            client->fd, channel_to_info(&team->channels.arr[i], &info),
-            sizeof(info));
-    }
+    WRITE(client->fd, team->channels.size);
+    for (size_t i = 0; i < team->channels.size; i++)
+        WRITE(client->fd, *channel_to_info(&team->channels.arr[i], &info));
 }
 
-static void list_threads(client_t *client, channel_t *channel)
+static void list_threads(server_t *server, client_t *client)
 {
     thread_info_t info = {0};
+    channel_t *channel = get_channel_by_uuid(
+        get_team_by_uuid(server, client->team), client->channel);
 
     dprintf(client->fd, "223");
     fsync(client->fd);
-    write(client->fd, &channel->threads.size, sizeof(channel->threads.size));
-    for (size_t i = 0; i < channel->threads.size; i++) {
-        write(
-            client->fd, thread_to_info(&channel->threads.arr[i], &info),
-            sizeof(info));
-    }
+    WRITE(client->fd, channel->threads.size);
+    for (size_t i = 0; i < channel->threads.size; i++)
+        WRITE(client->fd, *thread_to_info(&channel->threads.arr[i], &info));
 }
 
-static void list_replies(client_t *client, thread_t *thread, team_t *team)
+static void list_replies(server_t *server, client_t *client)
 {
     reply_info_t info = {0};
+    team_t *team = get_team_by_uuid(server, client->team);
+    channel_t *channel = get_channel_by_uuid(team, client->channel);
+    thread_t *thread = get_thread_by_uuid(channel, client->thread);
 
     dprintf(client->fd, "224");
     fsync(client->fd);
-    write(client->fd, &thread->comments.size, sizeof(thread->comments.size));
-    for (size_t i = 0; i < thread->comments.size; i++) {
-        write(
+    WRITE(client->fd, thread->comments.size);
+    for (size_t i = 0; i < thread->comments.size; i++)
+        WRITE(
             client->fd,
-            comment_to_info(&thread->comments.arr[i], &info, thread, team),
-            sizeof(info));
-    }
+            *comment_to_info(&thread->comments.arr[i], &info, thread, team));
 }
 
 void cmd_list(server_t *server, client_t *client)
 {
     if (!server || !client || !is_logged_in(client) || !check_context(client))
         return;
-    if (!client->team) {
+    if (uuid_is_null(client->team)) {
         list_teams(server, client);
         return;
     }
-    if (!user_in_team(client->user->uuid, client->team)) {
+    if (!user_in_team(client->user, get_team_by_uuid(server, client->team))) {
         dprintf(client->fd, "520");
         return;
     }
-    if (!client->channel) {
-        list_channels(client, client->team);
+    if (uuid_is_null(client->channel)) {
+        list_channels(server, client);
         return;
     }
-    if (!client->thread) {
-        list_threads(client, client->channel);
+    if (uuid_is_null(client->thread)) {
+        list_threads(server, client);
         return;
     }
-    list_replies(client, client->thread, client->team);
+    list_replies(server, client);
 }

src/server/cmds/cmd_login.c

@@ -38,9 +38,9 @@ static void assign_user(client_t *client, user_t *user)
 {
     char uuid_str[UUID_STR_LEN] = {0};
 
-    client->user = user;
+    uuid_copy(client->user, user->uuid);
     uuid_unparse(user->uuid, uuid_str);
-    DEBUG("User %s <%s> logged", client->user->name, uuid_str);
+    DEBUG("User %s <%s> logged", user->name, uuid_str);
     server_event_user_logged_in(uuid_str);
 }
 
@@ -64,10 +64,9 @@ void cmd_login(server_t *server, client_t *client)
         return;
     }
     user = get_user_by_name(server, name);
-    if (!user)
+    if (user == NULL)
         user = create_user(server, name);
     assign_user(client, user);
-    client->user->status += 1;
-    broadcast(
-        server, "311", user_to_info(client->user, &info, NULL), sizeof info);
+    user->status += 1;
+    broadcast(server, "311", user_to_info(user, &info, NULL), sizeof info);
 }

src/server/cmds/cmd_logout.c

@@ -18,17 +18,18 @@ void cmd_logout(server_t *server, client_t *client)
 {
     char uuid_str[UUID_STR_LEN] = {0};
     user_info_t info = {0};
+    user_t *user = NULL;
 
-    if (client->user == NULL)
+    if (uuid_is_null(client->user))
         return;
-    client->user->status = client->user->status - 1;
-    printf("-->%d\n", client->user->status);
-    client->user->status -= 1;
-    if (client->user->status < 0)
-        client->user->status = 0;
-    uuid_unparse(client->user->uuid, uuid_str);
+    user = get_user_by_uuid(server, client->user);
+    if (user == NULL)
+        return;
+    user->status -= 1;
+    if (user->status < 0)
+        user->status = 0;
+    uuid_unparse(user->uuid, uuid_str);
     server_event_user_logged_out(uuid_str);
-    broadcast(
-        server, "312", user_to_info(client->user, &info, NULL), sizeof info);
-    client->user = NULL;
+    broadcast(server, "312", user_to_info(user, &info, NULL), sizeof info);
+    uuid_clear(client->user);
 }

src/server/cmds/cmd_subscribe.c

@@ -29,17 +29,18 @@ static team_t *get_team(server_t *server, client_t *client, char *uuid_str)
     return NULL;
 }
 
-static void send_message(client_t *client, team_t *team)
+static void send_message(server_t *server, client_t *client, team_t *team)
 {
     user_info_t info = {0};
     char team_uuid[UUID_STR_LEN] = {0};
     char user_uuid[UUID_STR_LEN] = {0};
+    user_t *user = get_user_by_uuid(server, client->user);
 
-    uuid_unparse(client->user->uuid, user_uuid);
+    uuid_unparse(client->user, user_uuid);
     uuid_unparse(team->uuid, team_uuid);
     server_event_user_subscribed(team_uuid, user_uuid);
     write(client->fd, "215", 3);
-    write(client->fd, user_to_info(client->user, &info, team), sizeof info);
+    WRITE(client->fd, *user_to_info(user, &info, team));
 }
 
 void cmd_subscribe(server_t *server, client_t *client)
@@ -57,8 +58,8 @@ void cmd_subscribe(server_t *server, client_t *client)
     team = get_team(server, client, arg);
     if (!team)
         return;
-    if (user_in_team(client->user->uuid, team))
+    if (user_in_team(client->user, team))
         return;
-    append_to_array(&team->users, sizeof(uuid_t), client->user->uuid);
-    send_message(client, team);
+    append_to_array(&team->users, sizeof(uuid_t), client->user);
+    send_message(server, client, team);
 }

src/server/cmds/cmd_subscribed.c

@@ -44,7 +44,7 @@ static size_t count_teams(server_t *server, client_t *client)
     size_t nb = 0;
 
     for (size_t i = 0; i < server->teams.size; i++) {
-        if (user_in_team(client->user->uuid, &server->teams.arr[i]))
+        if (user_in_team(client->user, &server->teams.arr[i]))
             nb += 1;
     }
     return nb;
@@ -57,14 +57,10 @@ static void list_subscribed_team(server_t *server, client_t *client)
 
     dprintf(client->fd, "221");
     fsync(client->fd);
-    write(client->fd, &nb, sizeof(nb));
-    for (size_t i = 0; i < server->teams.size; i++) {
-        if (!user_in_team(client->user->uuid, &server->teams.arr[i]))
-            continue;
-        write(
-            client->fd, team_to_info(&server->teams.arr[i], &info),
-            sizeof(team_info_t));
-    }
+    WRITE(client->fd, nb);
+    for (size_t i = 0; i < server->teams.size; i++)
+        if (user_in_team(client->user, &server->teams.arr[i]))
+            WRITE(client->fd, *team_to_info(&server->teams.arr[i], &info));
 }
 
 static void list_subscribed_users(
@@ -74,14 +70,11 @@ static void list_subscribed_users(
 
     dprintf(client->fd, "225");
     fsync(client->fd);
-    write(client->fd, &team->users.size, sizeof(team->users.size));
-    for (size_t i = 0; i < server->users.size; i++) {
-        if (!user_in_team(server->users.arr[i].uuid, team))
-            continue;
-        write(
-            client->fd, user_to_info(&server->users.arr[i], &info, team),
-            sizeof(user_info_t));
-    }
+    WRITE(client->fd, team->users.size);
+    for (size_t i = 0; i < server->users.size; i++)
+        if (user_in_team(server->users.arr[i].uuid, team))
+            WRITE(
+                client->fd, *user_to_info(&server->users.arr[i], &info, team));
 }
 
 void cmd_subscribed(server_t *server, client_t *client)

src/server/cmds/cmd_unsubscribe.c

@@ -30,23 +30,26 @@ static team_t *get_team(server_t *server, client_t *client, char *uuid_str)
     return NULL;
 }
 
-static void send_message(client_t *client, team_t *team)
+static void send_message(server_t *server, client_t *client, team_t *team)
 {
     user_info_t info = {0};
     char team_uuid[UUID_STR_LEN] = {0};
     char user_uuid[UUID_STR_LEN] = {0};
+    user_t *user = get_user_by_uuid(server, client->user);
 
-    uuid_unparse(client->user->uuid, user_uuid);
+    if (user == NULL)
+        return;
+    uuid_unparse(client->user, user_uuid);
     uuid_unparse(team->uuid, team_uuid);
     server_event_user_unsubscribed(team_uuid, user_uuid);
     write(client->fd, "215", 3);
-    write(client->fd, user_to_info(client->user, &info, team), sizeof info);
+    write(client->fd, user_to_info(user, &info, team), sizeof info);
 }
 
 static void remove_user(client_t *client, team_t *team)
 {
     for (size_t i = 0; i < team->users.size; i++) {
-        if (uuid_compare(client->user->uuid, team->users.arr[i]) == 0) {
+        if (uuid_compare(client->user, team->users.arr[i]) == 0) {
             uuid_copy(
                 team->users.arr[i], team->users.arr[team->users.size - 1]);
             team->users.size -= 1;
@@ -68,10 +71,8 @@ void cmd_unsubscribe(server_t *server, client_t *client)
         return;
     }
     team = get_team(server, client, arg);
-    if (!team)
-        return;
-    if (!user_in_team(client->user->uuid, team))
+    if (team == NULL || !user_in_team(client->user, team))
         return;
     remove_user(client, team);
-    send_message(client, team);
+    send_message(server, client, team);
 }