mirrors
/
mastodont-c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Statuses don't init data 

FossilOrigin-Name: e1ddf93341d9515c62606692662911dfb683d5238b818d8c9a9406123ee7aa0a
This commit is contained in:
nekobit 2022-05-12 02:55:34 +00:00
parent c0c8a93606
commit 3191da7ea1
5 changed files with 35 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/mastodont_request.h
View File

@ -15,6 +15,7 @@
#ifndef MASTODONT_REQUEST_H
#define MASTODONT_REQUEST_H
#include <cjson/cJSON.h>
#include "mastodont_types.h"
#include "mastodont_fetch.h"
#include "mastodont_query.h"
@ -29,7 +30,7 @@ struct mastodont_request_args
size_t params_post_len;
CURLoption request_type;
void* args;
int (*callback)(void*);
int (*callback)(cJSON*, void*);
};
int mastodont_request(mastodont_t* data, struct mastodont_request_args* args);

48
include/mastodont_status.h
View File

@ -90,20 +90,11 @@ struct mstdnt_account_statuses_args
int limit;
};
// Cleanup
void mstdnt_cleanup_statuses(struct mstdnt_status* statuses, size_t s);
void mstdnt_cleanup_status(struct mstdnt_status* status);
int mstdnt_statuses_from_result(struct mstdnt_storage* storage,
struct mstdnt_fetch_results* results,
struct mstdnt_status* status[],
size_t* size);
int mstdnt_status_from_result(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_status* status);
int mstdnt_status_from_json(struct mstdnt_status* status, cJSON* js);
int mstdnt_status_json(struct mstdnt_status* status, cJSON* js);
int mastodont_status_emoji_react(mastodont_t* api, char* id, char* emoji,
struct mstdnt_storage* storage, struct mstdnt_status* status);
@ -115,20 +106,13 @@ int mstdnt_statuses_json(struct mstdnt_status* statuses[],
void _mstdnt_val_status_call(cJSON* v, void* _type);
void _mstdnt_val_malloc_status_call(cJSON* v, void* _type);
int mstdnt_status_context_from_result(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_status* statuses_before[],
struct mstdnt_status* statuses_after[],
size_t* size_before,
size_t* size_after);
int mstdnt_status_context_from_json(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_status* statuses_before[],
struct mstdnt_status* statuses_after[],
size_t* size_before,
size_t* size_after,
cJSON* js);
int mstdnt_status_context_json(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_status* statuses_before[],
struct mstdnt_status* statuses_after[],
size_t* size_before,
size_t* size_after,
cJSON* js);
int mastodont_get_account_statuses(mastodont_t* data,
char* id,
@ -233,16 +217,8 @@ int mastodont_get_favourites(mastodont_t* data,
struct mstdnt_status* statuses[],
size_t* size);
int _mstdnt_statuses_result_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* _args);
int _mstdnt_status_from_result_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* status);
int _mstdnt_status_context_from_result_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* _args);
int mstdnt_statuses_json_callback(cJSON* json, void* _args);
int mstdnt_status_json_callback(cJSON* json, void* status);
int mstdnt_status_context_json_callback(cJSON* json, void* _args);
#endif /* MASTODONT_STATUS */

1
src/error.c
View File

@ -32,6 +32,7 @@ int mstdnt_check_error(struct mstdnt_storage* storage)
{
int res = 0;
cJSON* v;
cJSON* root = storage->root;
/* Make sure empty */
storage->error = NULL;

5
src/request.c
View File

@ -20,6 +20,7 @@
#include <mastodont_request.h>
#include <mastodont_query.h>
#include <mastodont_error.h>
#include <mastodont_json_helper.h>
#define CONV_SIZE 64
@ -118,10 +119,10 @@ int mastodont_request(mastodont_t* data, struct mastodont_request_args* args)
// Create json structure
if (_mstdnt_json_init(&root, &results, storage) &&
mstdnt_check_error(&results, storage))
mstdnt_check_error(storage))
{
/* Optional */
if (args->callback) res = args->callback(args->args);
if (args->callback) res = args->callback(storage->root, args->args);
}
mastodont_fetch_results_cleanup(&results);

101
src/status.c
View File

@ -27,7 +27,7 @@ void _mstdnt_val_status_call(cJSON* v, void* _type)
{
struct mstdnt_status* type = _type;
mstdnt_status_from_json(type, v->child);
mstdnt_status_json(type, v->child);
}
@ -42,10 +42,10 @@ void _mstdnt_val_malloc_status_call(cJSON* v, void* _type)
*type = calloc(1, sizeof(struct mstdnt_status));
if (*type)
mstdnt_status_from_json(*type, v->child);
mstdnt_status_json(*type, v->child);
}
int mstdnt_status_from_json(struct mstdnt_status* status, cJSON* js)
int mstdnt_status_json(struct mstdnt_status* status, cJSON* js)
{
cJSON* v;
@ -96,43 +96,18 @@ int mstdnt_status_from_json(struct mstdnt_status* status, cJSON* js)
return 0;
}
int mstdnt_status_from_result(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_status* status)
int mstdnt_status_json_callback(cJSON* json, void* status)
{
/* Can be null sometimes */
if (!status) return 0;
cJSON* root;
if (_mstdnt_json_init(&root, results, storage) ||
!cJSON_IsObject(root))
return 1;
return mstdnt_status_from_json(status, root->child);
}
int _mstdnt_status_from_result_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* status)
{
return mstdnt_status_from_result(results, storage, (struct mstdnt_status*)status);
}
int mstdnt_statuses_from_result(struct mstdnt_storage* storage,
struct mstdnt_fetch_results* results,
struct mstdnt_status* statuses[],
size_t* size)
{
return mstdnt_statuses_json(statuses, size, storage->root);
return mstdnt_status_json((struct mstdnt_status*)status, json);
}
// GENERATE mstdnt_statuses_json
GENERATE_JSON_ARRAY_FUNC(mstdnt_statuses_json, struct mstdnt_status, mstdnt_status_from_json)
GENERATE_JSON_ARRAY_FUNC(mstdnt_statuses_json, struct mstdnt_status, mstdnt_status_json)
int mstdnt_statuses_json_callback(void* _args)
int mstdnt_statuses_json_callback(cJSON* json, void* _args)
{
struct _mstdnt_statuses_cb_args* args = _args;
return mstdnt_statuses_from_result(storage, results, args->statuses, args->size);
return mstdnt_statuses_json(args->statuses, args->size, json);
}
int mastodont_get_account_statuses(mastodont_t* data,
@ -167,7 +142,7 @@ int mastodont_get_account_statuses(mastodont_t* data,
NULL, 0,
CURLOPT_HTTPGET,
&cb_args,
_mstdnt_statuses_result_callback
mstdnt_statuses_json_callback
};
return mastodont_request(data, &req_args);
@ -221,7 +196,7 @@ static int mstdnt_status_action(mastodont_t* data,
NULL, 0,
CURLOPT_POST,
status,
_mstdnt_status_from_result_callback
mstdnt_status_json_callback
};
return mastodont_request(data, &req_args);
@ -284,42 +259,13 @@ int mastodont_get_status(mastodont_t* data,
NULL, 0,
CURLOPT_HTTPGET,
status,
_mstdnt_status_from_result_callback,
mstdnt_status_json_callback,
};
return mastodont_request(data, &req_args);
}
int mstdnt_status_context_from_result(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_status* statuses_before[],
struct mstdnt_status* statuses_after[],
size_t* size_before,
size_t* size_after)
{
cJSON* root;
/* Empty data */
*size_before = 0;
*size_after = 0;
*statuses_before = NULL;
*statuses_after = NULL;
if (_mstdnt_json_init(&root, results, storage))
return 1;
mstdnt_status_context_from_json(results,
storage,
statuses_before,
statuses_after,
size_before,
size_after,
root);
return 0;
}
int mstdnt_status_context_from_json(struct mstdnt_fetch_results* results,
int mstdnt_status_context_json(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_status* statuses_before[],
struct mstdnt_status* statuses_after[],
@ -362,7 +308,7 @@ int mstdnt_status_context_from_json(struct mstdnt_fetch_results* results,
cJSON_ArrayForEach(status_item, v)
{
mstdnt_status_from_json((*stat_ptr) + (*size_ptr)++, status_item->child);
mstdnt_status_json((*stat_ptr) + (*size_ptr)++, status_item->child);
}
}
}
@ -370,19 +316,6 @@ int mstdnt_status_context_from_json(struct mstdnt_fetch_results* results,
return 0;
}
int _mstdnt_status_context_from_result_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* _args)
{
struct _mstdnt_status_context_result_cb_args* args = _args;
return mstdnt_status_context_from_result(results,
storage,
args->statuses_before,
args->statuses_after,
args->size_before,
args->size_after);
}
int mastodont_get_status_context(mastodont_t* data,
char* id,
struct mstdnt_storage* storage,
@ -407,7 +340,7 @@ int mastodont_get_status_context(mastodont_t* data,
NULL, 0,
CURLOPT_HTTPGET,
&args,
_mstdnt_status_context_from_result_callback,
mstdnt_status_context_json_callback,
};
return mastodont_request(data, &req_args);
@ -488,7 +421,7 @@ int mastodont_get_bookmarks(mastodont_t* data,
NULL, 0,
CURLOPT_HTTPGET,
&cb_args,
_mstdnt_statuses_result_callback,
mstdnt_statuses_json_callback,
};
return mastodont_request(data, &req_args);
@ -515,7 +448,7 @@ int mastodont_get_favourites(mastodont_t* data,
NULL, 0,
CURLOPT_HTTPGET,
&cb_args,
_mstdnt_statuses_result_callback,
mstdnt_statuses_json_callback,
};
return mastodont_request(data, &req_args);
@ -534,7 +467,7 @@ int mastodont_status_emoji_react(mastodont_t* api, char* id, char* emoji,
NULL, 0,
CURLOPT_PUT,
&status,
_mstdnt_status_from_result_callback
mstdnt_status_json_callback
};
return mastodont_request(api, &req_args);