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

Refactor status and status context

Browse source 
FossilOrigin-Name: 52020e5d70787a510a2c79d1c8fd9e6fa7ca3ab3a2c21951e317bd7c1eef42eb
This commit is contained in:
me@ow.nekobit.net 2022-03-18 03:13:41 +00:00
parent d88e4f896b
commit 7df17d4feb
4 changed files with 113 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/mastodont_status.h
View file

@ -97,6 +97,21 @@ int mstdnt_status_from_result(struct mstdnt_fetch_results* results,
int mstdnt_status_from_json(struct mstdnt_status* status, cJSON* js);
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 mastodont_get_account_statuses(mastodont_t* data,
char* id,
struct mstdnt_args* args,

1
src/.#request.c Symbolic link
View file

@ -0,0 +1 @@
nekobit@toomuchram.2137:1647556304

5
src/request.c
View file

@ -27,6 +27,11 @@ int mastodont_request(mastodont_t* data, struct mastodont_request_args* args)
storage->needs_cleanup = 0;
if (args->params_query)
{
}
if (args->params_post)
{
post = _mstdnt_query_string(data, NULL, args->params_post, args->params_post_len);

135
src/status.c
View file

@ -28,8 +28,17 @@ struct mstdnt_statuses_args
size_t* size;
};
struct mstdnt_status_context_result_args
{
struct mstdnt_status** statuses_before;
struct mstdnt_status** statuses_after;
size_t* size_before;
size_t* size_after;
};
int mstdnt_status_from_json(struct mstdnt_status* status, cJSON* js)
{
js = js->child; /* Get in */
cJSON* v;
struct _mstdnt_generic_args att_args = {
@ -74,14 +83,11 @@ int mstdnt_status_from_result(struct mstdnt_fetch_results* results,
struct mstdnt_status* status)
{
cJSON* root;
if (_mstdnt_json_init(&root, results, storage))
if (_mstdnt_json_init(&root, results, storage) ||
!cJSON_IsObject(root))
return 1;
if (!cJSON_IsObject(root))
return 1;
if (!mstdnt_status_from_json(status, root->child))
storage->needs_cleanup = 1;
mstdnt_status_from_json(status, root);
return 1;
}
@ -259,48 +265,53 @@ int mastodont_view_status(mastodont_t* data,
NULL, 0,
NULL, 0,
CURLOPT_HTTPGET,
status, /* is casted to void* */
mstdnt_status_from_result_callback, /* TODO populate the status back?
* (not sure if the api returns it or not) */
status,
mstdnt_status_from_result_callback,
};
return mastodont_request(data, &req_args);
}
int mastodont_status_context(mastodont_t* data,
char* id,
struct mstdnt_storage* storage,
struct mstdnt_status* statuses_before[],
struct mstdnt_status* statuses_after[],
size_t* size_before,
size_t* size_after)
{
int res = 0;
cJSON* root, *v, *status_item;
size_t* size_ptr;
struct mstdnt_status** stat_ptr = NULL;
char url[MSTDNT_URLSIZE];
struct mstdnt_fetch_results results = { 0 };
snprintf(url, MSTDNT_URLSIZE, "api/v1/statuses/%s/context", id);
storage->needs_cleanup = 0;
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;
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,
struct mstdnt_storage* storage,
struct mstdnt_status* statuses_before[],
struct mstdnt_status* statuses_after[],
size_t* size_before,
size_t* size_after,
cJSON* root)
{
cJSON* v, *status_item;
size_t* size_ptr = NULL;
struct mstdnt_status** stat_ptr = NULL;
/* Empty data */
*size_before = 0;
*size_after = 0;
*statuses_before = NULL;
*statuses_after = NULL;
if (mastodont_fetch_curl(data, url, &results, CURLOPT_HTTPGET) != CURLE_OK)
{
return 1;
}
if (_mstdnt_json_init(&root, &results, storage))
{
res = 1;
goto cleanup;
}
storage->root = root;
for (v = root->child; v; v = v->next)
{
if (cJSON_IsObject(v->child))
@ -325,14 +336,52 @@ int mastodont_status_context(mastodont_t* data,
return 1;
cJSON_ArrayForEach(status_item, v)
mstdnt_status_from_json((*stat_ptr) + (*size_ptr)++, status_item->child);
mstdnt_status_from_json((*stat_ptr) + (*size_ptr)++, status_item);
}
}
storage->needs_cleanup = 1;
cleanup:
mastodont_fetch_results_cleanup(&results);
}
return res;
static int mstdnt_status_context_from_result_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* _args)
{
struct mstdnt_status_context_result_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_status_context(mastodont_t* data,
char* id,
struct mstdnt_storage* storage,
struct mstdnt_status* statuses_before[],
struct mstdnt_status* statuses_after[],
size_t* size_before,
size_t* size_after)
{
struct mstdnt_status_context_result_args args = {
statuses_before,
statuses_after,
size_before,
size_after,
};
char url[MSTDNT_URLSIZE];
snprintf(url, MSTDNT_URLSIZE, "api/v1/statuses/%s/context", id);
struct mastodont_request_args req_args = {
storage,
url,
NULL, 0,
NULL, 0,
CURLOPT_HTTPGET,
&args,
mstdnt_status_context_from_result_callback,
};
return mastodont_request(data, &req_args);
}
void cleanup_status(struct mstdnt_status* status)