Fix bugs after refactoring

Signed-off-by: Elmurod Talipov <elmurod.talipov@gmail.com>

Author: smartnode

include/telebot-core.h

@@ -478,17 +478,14 @@ telebot_core_response_t telebot_core_send_video_note(telebot_core_handler_t core
  * @param[in] count Number of photos in the array (2–10).
  * @param[in] disable_notification Sends the message silently. Users will receive a notification with no sound.
  * @param[in] reply_to_message_id If the message is a reply, ID of the original message.
- * @param[out] response Response data that contains the sent messages on success. It MUST be freed with #telebot_core_put_response().
- * @return on Success, TELEBOT_ERROR_NONE is returned, otherwise a negative error value.
+ * @return #telebot_core_response_t response that contains the sent message,
+ * which MUST be released with #telebot_core_put_response(), or null if allocation fails.
+ * Response code should be checked with #teleobot_core_get_response_code(),
+ * before getting data with #telebot_core_get_response_data().
  */
-telebot_error_e telebot_core_send_media_group(
-    telebot_core_handler_t *core_h,
-    long long int chat_id,
-    char *media_paths[],
-    int count,
-    bool disable_notification,
-    int reply_to_message_id,
-    telebot_core_response_t *response);
+telebot_core_response_t telebot_core_send_media_group(telebot_core_handler_t core_h,
+    long long int chat_id, char *media_paths[], int count, bool disable_notification,
+    int reply_to_message_id);
 
 /**
  * @brief Send point on the map.

src/telebot-core.c

@@ -23,6 +23,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <json.h>
+#include <json_object.h>
 #include <telebot-common.h>
 #include <telebot-core.h>
 #include <telebot-private.h>
@@ -65,12 +67,13 @@ telebot_core_create(telebot_core_handler_t *core_h, const char *token)
 
     *core_h = NULL;
 
-    telebot_core_handler_t _core_h = malloc(sizeof(telebot_core_handler_t));
+    telebot_core_handler_t _core_h = malloc(sizeof(struct telebot_core_handler));
     if (_core_h == NULL)
     {
         ERR("Failed to allocate memory");
         return TELEBOT_ERROR_OUT_OF_MEMORY;
     }
+
     _core_h->token = strdup(token);
     if (_core_h->token == NULL)
     {

src/telebot.c

@@ -49,8 +49,7 @@ static const char *telebot_update_type_str[TELEBOT_UPDATE_TYPE_MAX] = {
     "shipping_query",
     "pre_checkout_query",
     "poll",
-    "poll_answer"
-};
+    "poll_answer"};
 
 static void telebot_put_user(telebot_user_t *user);
 static void telebot_put_chat_photo(telebot_chat_photo_t *photo);
@@ -619,17 +618,15 @@ telebot_error_e telebot_send_video_note(telebot_handler_t handle, long long int
 telebot_error_e telebot_send_media_group(telebot_handler_t handle, long long int chat_id, char *media_paths[],
                                          int count, bool disable_notification, int reply_to_message_id)
 {
-    telebot_hdata_t *_handle = (telebot_hdata_t *)handle;
-    if (_handle == NULL)
-        return TELEBOT_ERROR_NOT_SUPPORTED;
+    telebot_core_response_t response;
 
     if ((media_paths == NULL) || (count < 2) || (count > 10))
         return TELEBOT_ERROR_INVALID_PARAMETER;
 
-    telebot_core_response_t response;
-    telebot_error_e ret = telebot_core_send_media_group(_handle->core_h, chat_id, media_paths, count, disable_notification,
-                                                        reply_to_message_id, &response);
-    telebot_core_put_response(&response);
+    response = telebot_core_send_media_group(handle->core_h, chat_id, media_paths, count, disable_notification,
+                                             reply_to_message_id);
+    int ret = telebot_core_get_response_code(response);
+    telebot_core_put_response(response);
     return ret;
 }
 
@@ -1603,7 +1600,7 @@ telebot_error_e telebot_put_chat(telebot_chat_t *chat)
     telebot_put_chat_photo(chat->photo);
     TELEBOT_SAFE_FREE(chat->photo);
 
-    for (size_t index=0; index < chat->count_active_usernames; index++)
+    for (size_t index = 0; index < chat->count_active_usernames; index++)
         TELEBOT_SAFE_FREE(chat->active_usernames[index]);
     TELEBOT_SAFE_FREE(chat->active_usernames);
     chat->count_active_usernames = 0;