From 1d9cdba58e834ff82033c92bcc570a03bcc61084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Mon, 29 Apr 2024 21:56:38 +0200
Subject: [PATCH] relay/api: rename field "nicklist" to "nicklist_root" in GET
 /api/buffers

---
 src/plugins/relay/api/relay-api-msg.c          |  8 ++++----
 .../plugins/relay/api/test-relay-api-msg.cpp   | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/plugins/relay/api/relay-api-msg.c b/src/plugins/relay/api/relay-api-msg.c
index 2e32b612f..909269631 100644
--- a/src/plugins/relay/api/relay-api-msg.c
+++ b/src/plugins/relay/api/relay-api-msg.c
@@ -369,7 +369,7 @@ relay_api_msg_buffer_to_json (struct t_gui_buffer *buffer,
 {
     struct t_hdata *hdata;
     struct t_gui_buffer *pointer;
-    cJSON *json, *json_local_vars, *json_lines, *json_nicklist;
+    cJSON *json, *json_local_vars, *json_lines, *json_nicklist_root;
     const char *ptr_string;
     char *string;
 
@@ -413,11 +413,11 @@ relay_api_msg_buffer_to_json (struct t_gui_buffer *buffer,
     /* nicks */
     if (nicks)
     {
-        json_nicklist = relay_api_msg_nick_group_to_json (
+        json_nicklist_root = relay_api_msg_nick_group_to_json (
             weechat_hdata_pointer (hdata, buffer, "nicklist_root"),
             colors);
-        if (json_nicklist)
-            cJSON_AddItemToObject (json, "nicklist", json_nicklist);
+        if (json_nicklist_root)
+            cJSON_AddItemToObject (json, "nicklist_root", json_nicklist_root);
     }
 
     return json;
diff --git a/tests/unit/plugins/relay/api/test-relay-api-msg.cpp b/tests/unit/plugins/relay/api/test-relay-api-msg.cpp
index c553539b1..bf2d81bb5 100644
--- a/tests/unit/plugins/relay/api/test-relay-api-msg.cpp
+++ b/tests/unit/plugins/relay/api/test-relay-api-msg.cpp
@@ -119,7 +119,7 @@ TEST(RelayApiMsg, SendEvent)
 TEST(RelayApiMsg, BufferToJson)
 {
     cJSON *json, *json_obj, *json_local_vars, *json_lines;
-    cJSON *json_nicklist, *json_nicks, *json_groups, *json_group;
+    cJSON *json_nicklist_root, *json_nicks, *json_groups, *json_group;
     cJSON *json_group_nicks, *json_nick;
     struct t_gui_buffer *buffer;
     struct t_gui_nick_group *group;
@@ -179,13 +179,13 @@ TEST(RelayApiMsg, BufferToJson)
     CHECK(json_lines);
     CHECK(cJSON_IsArray (json_lines));
     LONGS_EQUAL(0, cJSON_GetArraySize (json_lines));
-    json_nicklist = cJSON_GetObjectItem (json, "nicklist");
-    CHECK(json_nicklist);
-    CHECK(cJSON_IsObject (json_nicklist));
-    WEE_CHECK_OBJ_NUM(0, json_nicklist, "id");
-    WEE_CHECK_OBJ_STR("root", json_nicklist, "name");
-    WEE_CHECK_OBJ_STR("", json_nicklist, "color");
-    json_groups = cJSON_GetObjectItem (json_nicklist, "groups");
+    json_nicklist_root = cJSON_GetObjectItem (json, "nicklist_root");
+    CHECK(json_nicklist_root);
+    CHECK(cJSON_IsObject (json_nicklist_root));
+    WEE_CHECK_OBJ_NUM(0, json_nicklist_root, "id");
+    WEE_CHECK_OBJ_STR("root", json_nicklist_root, "name");
+    WEE_CHECK_OBJ_STR("", json_nicklist_root, "color");
+    json_groups = cJSON_GetObjectItem (json_nicklist_root, "groups");
     CHECK(json_groups);
     CHECK(cJSON_IsArray (json_groups));
     LONGS_EQUAL(1, cJSON_GetArraySize (json_groups));
@@ -256,7 +256,7 @@ TEST(RelayApiMsg, BufferToJson)
     WEE_CHECK_OBJ_STR(color, json_nick, "color");
     free (color);
     WEE_CHECK_OBJ_BOOL(1, json_nick, "visible");
-    json_nicks = cJSON_GetObjectItem (json_nicklist, "nicks");
+    json_nicks = cJSON_GetObjectItem (json_nicklist_root, "nicks");
     CHECK(json_nicks);
     CHECK(cJSON_IsArray (json_nicks));
     LONGS_EQUAL(1, cJSON_GetArraySize (json_nicks));