refactor(json): improve code and struct names

include/common.h

@@ -6,6 +6,7 @@
 
 #define TOKEN_SIZE 128
 #define API_SIZE 512
+#define URL_LEN 1024
 
 #define FIRSTNAME_SIZE 256
 #define USERNAME_SIZE 32
@@ -76,7 +77,7 @@ typedef void (*Callback)(tgbot_s *bot, tgbot_cbquery_s *query);
 /**
  * @brief An enum to represent error codes.
  */
-enum tgbot_rc_t {
+enum tgbot_rc {
 	TGBOT_OK = 0,
 	TGBOT_INIT_ERROR,
 	TGBOT_REQUEST_ERROR,
@@ -87,22 +88,22 @@ enum tgbot_rc_t {
 	TGBOT_SENDDICE_ERROR,
 	TGBOT_TELEGRAM_OK_ERROR,
 };
-typedef enum tgbot_rc_t tgbot_rc;
+typedef enum tgbot_rc tgbot_rc;
 
-enum tgbot_json_opt_type_t {
+enum tgbot_opt_type {
 	tgbot_opt_int,
 	tgbot_opt_int64,
 	tgbot_opt_string,
 	tgbot_opt_inlinekeyboard,
 	tgbot_opt_null,
 };
-typedef enum tgbot_json_opt_type_t tgbot_json_opt_type;
+typedef enum tgbot_opt_type tgbot_opt_type_e;
 
-struct tgbot_json_option_t {
+struct tgbot_option {
 	char key[32];
 	void *value;
-	tgbot_json_opt_type type;
+	tgbot_opt_type_e type;
 };
-typedef struct tgbot_json_option_t tgbot_json_option;
+typedef struct tgbot_option tgbot_option_s;
 
 #endif

include/json.h

@@ -4,7 +4,7 @@
 #include "types.h"
 #include <json-c/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 *json_ikb_new(tgbot_inlinekeyboard_s *keyboard);
 

include/methods.h

@@ -4,12 +4,8 @@
 #include "types.h"
 #include <json-c/json.h>
 
+/* Retrieve update */
 tgbot_rc tgbot_get_update(tgbot_s *bot, tgbot_update_s *update, Callback cbq_handler);
-tgbot_rc tgbot_parse_message(tgbot_s *bot, tgbot_update_s *update, json_object *result);
-tgbot_rc tgbot_parse_cbquery(tgbot_s *bot, tgbot_cbquery_s *query, json_object *result, Callback query_handler);
-
-/* Request */
-tgbot_rc tgbot_request(const char *url, struct memory_buffer **mb, json_object *json);
 
 /* Methods */
 tgbot_rc tgbot_get_me(tgbot_s *bot, tgbot_me_s *me);