pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00
Code Activity

relay/api: add nicklist group and nick id in response to GET /api/buffers (issue #2081)

Browse Source
This commit is contained in:
Sébastien Helleu
2024-04-07 10:26:42 +02:00
parent 89fe540b53
commit 7c2f44e74e
2 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/relay/api/relay-api-msg.c
+17 -3
View File
@@ -557,6 +557,7 @@ relay_api_msg_nick_to_json (struct t_gui_nick *nick)
{
struct t_hdata *hdata;
struct t_gui_nick *pointer;
struct t_gui_nick_group *ptr_group;
cJSON *json;
const char *ptr_string;
@@ -570,6 +571,13 @@ relay_api_msg_nick_to_json (struct t_gui_nick *nick)
if (!nick)
return json;
MSG_ADD_HDATA_VAR(Number, "id", longlong, "id");
ptr_group = weechat_hdata_pointer (relay_hdata_nick, nick, "group");
cJSON_AddItemToObject (
json, "parent_group_id",
cJSON_CreateNumber (
(ptr_group) ?
weechat_hdata_longlong (relay_hdata_nick_group, ptr_group, "id") : -1));
MSG_ADD_HDATA_STR("prefix", "prefix");
MSG_ADD_HDATA_STR("prefix_color", "prefix_color");
MSG_ADD_HDATA_STR("name", "name");
@@ -587,11 +595,10 @@ cJSON *
relay_api_msg_nick_group_to_json (struct t_gui_nick_group *nick_group)
{
struct t_hdata *hdata;
struct t_gui_nick_group *pointer;
struct t_gui_nick_group *pointer, *ptr_group;
struct t_gui_nick *ptr_nick;
cJSON *json, *json_groups, *json_nicks;
const char *ptr_string;
struct t_gui_nick_group *ptr_group;
struct t_gui_nick *ptr_nick;
hdata = relay_hdata_nick_group;
pointer = nick_group;
@@ -603,6 +610,13 @@ relay_api_msg_nick_group_to_json (struct t_gui_nick_group *nick_group)
if (!nick_group)
return json;
MSG_ADD_HDATA_VAR(Number, "id", longlong, "id");
ptr_group = weechat_hdata_pointer (relay_hdata_nick_group, nick_group, "parent");
cJSON_AddItemToObject (
json, "parent_group_id",
cJSON_CreateNumber (
(ptr_group) ?
weechat_hdata_longlong (relay_hdata_nick_group, ptr_group, "id") : -1));
MSG_ADD_HDATA_STR("name", "name");
MSG_ADD_HDATA_STR("color", "color");
MSG_ADD_HDATA_VAR(Bool, "visible", integer, "visible");
tests/unit/plugins/relay/api/test-relay-api-msg.cpp
+31
View File
@@ -122,6 +122,7 @@ TEST(RelayApiMsg, BufferToJson)
cJSON *json_nicks, *json_groups, *json_group, *json_group_nicks, *json_nick;
struct t_gui_buffer *buffer;
struct t_gui_nick_group *group;
long long group_id;
json = relay_api_msg_buffer_to_json (NULL, 0, 0, RELAY_API_COLORS_ANSI);
CHECK(json);
@@ -179,6 +180,7 @@ TEST(RelayApiMsg, BufferToJson)
json_nicks = cJSON_GetObjectItem (json, "nicks");
CHECK(json_nicks);
CHECK(cJSON_IsObject (json_nicks));
WEE_CHECK_OBJ_NUM(0, json_nicks, "id");
WEE_CHECK_OBJ_STR("root", json_nicks, "name");
WEE_CHECK_OBJ_STR("", json_nicks, "color");
json_groups = cJSON_GetObjectItem (json_nicks, "groups");
@@ -188,6 +190,15 @@ TEST(RelayApiMsg, BufferToJson)
json_group = cJSON_GetArrayItem (json_groups, 0);
CHECK(json_group);
CHECK(cJSON_IsObject (json_group));
json_obj = cJSON_GetObjectItem (json_group, "id");
CHECK(json_obj);
CHECK(cJSON_IsNumber (json_obj));
group_id = cJSON_GetNumberValue (json_obj);
CHECK(group_id > 0);
json_obj = cJSON_GetObjectItem (json_group, "parent_group_id");
CHECK(json_obj);
CHECK(cJSON_IsNumber (json_obj));
CHECK(cJSON_GetNumberValue (json_obj) == 0);
WEE_CHECK_OBJ_STR("group1", json_group, "name");
WEE_CHECK_OBJ_STR("magenta", json_group, "color");
json_group_nicks = cJSON_GetObjectItem (json_group, "nicks");
@@ -197,6 +208,11 @@ TEST(RelayApiMsg, BufferToJson)
json_nick = cJSON_GetArrayItem (json_group_nicks, 0);
CHECK(json_nick);
CHECK(cJSON_IsObject (json_nick));
json_obj = cJSON_GetObjectItem (json_nick, "id");
CHECK(json_obj);
CHECK(cJSON_IsNumber (json_obj));
CHECK(cJSON_GetNumberValue (json_obj) > 0);
WEE_CHECK_OBJ_NUM(group_id, json_nick, "parent_group_id");
WEE_CHECK_OBJ_STR("@", json_nick, "prefix");
WEE_CHECK_OBJ_STR("lightred", json_nick, "prefix_color");
WEE_CHECK_OBJ_STR("nick1", json_nick, "name");
@@ -205,6 +221,11 @@ TEST(RelayApiMsg, BufferToJson)
json_nick = cJSON_GetArrayItem (json_group_nicks, 1);
CHECK(json_nick);
CHECK(cJSON_IsObject (json_nick));
json_obj = cJSON_GetObjectItem (json_nick, "id");
CHECK(json_obj);
CHECK(cJSON_IsNumber (json_obj));
CHECK(cJSON_GetNumberValue (json_obj) > 0);
WEE_CHECK_OBJ_NUM(group_id, json_nick, "parent_group_id");
WEE_CHECK_OBJ_STR("", json_nick, "prefix");
WEE_CHECK_OBJ_STR("", json_nick, "prefix_color");
WEE_CHECK_OBJ_STR("nick2", json_nick, "name");
@@ -213,6 +234,11 @@ TEST(RelayApiMsg, BufferToJson)
json_nick = cJSON_GetArrayItem (json_group_nicks, 2);
CHECK(json_nick);
CHECK(cJSON_IsObject (json_nick));
json_obj = cJSON_GetObjectItem (json_nick, "id");
CHECK(json_obj);
CHECK(cJSON_IsNumber (json_obj));
CHECK(cJSON_GetNumberValue (json_obj) > 0);
WEE_CHECK_OBJ_NUM(group_id, json_nick, "parent_group_id");
WEE_CHECK_OBJ_STR("", json_nick, "prefix");
WEE_CHECK_OBJ_STR("", json_nick, "prefix_color");
WEE_CHECK_OBJ_STR("nick3", json_nick, "name");
@@ -225,6 +251,11 @@ TEST(RelayApiMsg, BufferToJson)
json_nick = cJSON_GetArrayItem (json_nicks, 0);
CHECK(json_nick);
CHECK(cJSON_IsObject (json_nick));
json_obj = cJSON_GetObjectItem (json_nick, "id");
CHECK(json_obj);
CHECK(cJSON_IsNumber (json_obj));
CHECK(cJSON_GetNumberValue (json_obj) > 0);
WEE_CHECK_OBJ_NUM(0, json_nick, "parent_group_id");
WEE_CHECK_OBJ_STR("+", json_nick, "prefix");
WEE_CHECK_OBJ_STR("yellow", json_nick, "prefix_color");
WEE_CHECK_OBJ_STR("root_nick_hidden", json_nick, "name");