francesco/tgbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(json): improve code and struct names

Browse Source
This commit is contained in:
Francesco
2026-01-30 01:42:13 +01:00
parent 773dae4676
commit da146feec8
4 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/json.c
+41 -15
View File
@@ -1,27 +1,41 @@
#include <stdio.h>
#include <string.h>
#include "json.h"
json_object *json_builder(tgbot_json_option *options, size_t optionslen) {
json_object *json_builder(tgbot_option_s *options, size_t optionslen) {
json_object *rjson = json_object_new_object();
if (!rjson) {
return NULL;
}
for (size_t i = 0; i < optionslen; ++i) {
if (options[i].type == tgbot_opt_int) {
json_object_object_add(rjson, options[i].key, json_object_new_int(*((int32_t *)options[i].value)));
} else if (options[i].type == tgbot_opt_string) {
if (!options[i].value) {
continue;
switch (options[i].type) {
case tgbot_opt_int: {
json_object_object_add(rjson, options[i].key, json_object_new_int(*((int32_t *)options[i].value)));
break;
}
json_object_object_add(rjson, options[i].key, json_object_new_string((char *)options[i].value));
} else if (options[i].type == tgbot_opt_int64) {
json_object_object_add(rjson, options[i].key, json_object_new_int64(*((int64_t *)options[i].value)));
} else if (options[i].type == tgbot_opt_inlinekeyboard) {
if (options[i].value != NULL) {
json_object *reply_markup = json_ikb_new((tgbot_inlinekeyboard_s *)options[i].value);
json_object_object_add(rjson, "reply_markup", reply_markup);
case tgbot_opt_string: {
if (!options[i].value) {
break;
}
json_object_object_add(rjson, options[i].key, json_object_new_string((char *)options[i].value));
break;
}
case tgbot_opt_int64: {
json_object_object_add(rjson, options[i].key, json_object_new_int64(*((int64_t *)options[i].value)));
break;
}
case tgbot_opt_inlinekeyboard: {
if (options[i].value != NULL) {
json_object *reply_markup = json_ikb_new((tgbot_inlinekeyboard_s *)options[i].value);
json_object_object_add(rjson, options[i].key, reply_markup);
}
break;
}
case tgbot_opt_null: {
break;
}
} else if (options[i].type == tgbot_opt_null) {
continue;
}
}
@@ -30,7 +44,15 @@ json_object *json_builder(tgbot_json_option *options, size_t optionslen) {
json_object *json_ikb_new(tgbot_inlinekeyboard_s *keyboard) {
json_object *reply_markup = json_object_new_object();
if (!reply_markup) {
return NULL;
}
json_object *inline_keyboard_array = json_object_new_array();
if (!inline_keyboard_array) {
json_object_put(reply_markup);
return NULL;
}
for (size_t i = 0; i < keyboard->rows; ++i) {
json_object *row = json_object_new_array();
@@ -41,6 +63,10 @@ json_object *json_ikb_new(tgbot_inlinekeyboard_s *keyboard) {
}
json_object *button = json_object_new_object();
if (!button) {
continue;
}
json_object_object_add(button, "text", json_object_new_string(kbbutton->text));
json_object_object_add(button, "url", json_object_new_string(kbbutton->url));
json_object_object_add(button, "callback_data", json_object_new_string(kbbutton->callback_data));