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

Account arrays

Browse source 
FossilOrigin-Name: eb35c30fdcbc1e481959520a9ffe48b2027181637bd941b977927654ce4351c2
This commit is contained in:
me@ow.nekobit.net 2022-04-20 17:58:00 +00:00
parent d1623660d4
commit ce3955d22f
2 changed files with 64 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/mastodont_account.h
View file

@ -23,6 +23,12 @@
#define MSTDNT_LOOKUP_ACCT 0
#define MSTDNT_LOOKUP_ID 1
struct mstdnt_account_args
{
struct mstdnt_account** acct;
size_t* size;
};
struct mstdnt_account
{
char* id;
@ -78,18 +84,26 @@ MSTDNT_ACCOUNT_ACTION_DECL(unsubscribe);
int mstdnt_account_from_result(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_account* acct,
size_t* size);
struct mstdnt_account* acct);
int mstdnt_accounts_result(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_account* accts[],
size_t* size);
int mastodont_get_account(mastodont_t* data,
int lookup_type,
char* id,
struct mstdnt_account* acct,
struct mstdnt_storage* storage,
size_t* size);
struct mstdnt_storage* storage);
int mstdnt_account_from_json(struct mstdnt_account* status, cJSON* js);
int mstdnt_account_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* _args);
int mstdnt_accounts_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* _args);
void _mstdnt_val_account_call(cJSON* v, void* _type);
void _mstdnt_val_malloc_account_call(cJSON* v, void* _type);

62
src/account.c
View file

@ -20,12 +20,6 @@
#include <mastodont_request.h>
#include <mastodont_json_helper.h>
struct mstdnt_account_args
{
struct mstdnt_account* acct;
size_t* size;
};
void _mstdnt_val_account_call(cJSON* v, void* _type)
{
struct mstdnt_account* type = _type;
@ -45,8 +39,7 @@ void _mstdnt_val_malloc_account_call(cJSON* v, void* _type)
int mstdnt_account_from_result(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_account* acct,
size_t* size)
struct mstdnt_account* acct)
{
cJSON* root;
root = cJSON_ParseWithLength(results->response, results->size);
@ -64,23 +57,58 @@ int mstdnt_account_from_result(struct mstdnt_fetch_results* results,
return 0;
}
static int mstdnt_account_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* _args)
int mstdnt_accounts_result(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
struct mstdnt_account* accts[],
size_t* size)
{
struct mstdnt_account_args* args = _args;
return mstdnt_account_from_result(results, storage, args->acct, args->size);
size_t i = 0;
cJSON* root, *acct_j_list;
if (_mstdnt_json_init(&root, results, storage) &&
!cJSON_IsArray(root))
return 1;
if (size) *size = cJSON_GetArraySize(root);
/* accounts can be an empty array! */
if (!(size ? *size : cJSON_GetArraySize(root)))
return 0; /* Not an error, but we are done parsing */
/* malloc array - cJSON does a loop to count, let's do it once preferably */
*accts = calloc(1, (size ? *size : cJSON_GetArraySize(root))
* sizeof(struct mstdnt_account));
if (*accts == NULL)
return 1;
cJSON_ArrayForEach(acct_j_list, root)
{
mstdnt_account_from_json((*accts) + i++, acct_j_list->child);
}
return 0;
}
int mstdnt_account_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* args)
{
return mstdnt_account_from_result(results, storage, args);
}
int mstdnt_accounts_callback(struct mstdnt_fetch_results* results,
struct mstdnt_storage* storage,
void* _args)
{
struct mstdnt_account_args* args = _args;
return mstdnt_accounts_result(results, storage, args->acct, args->size);
}
int mastodont_get_account(mastodont_t* data,
int lookup, /* TODO move into separate function for consistancy */
char* id,
struct mstdnt_account* acct,
struct mstdnt_storage* storage,
size_t* size)
struct mstdnt_storage* storage)
{
struct mstdnt_account_args acct_args = { acct, size };
/* Url */
char url[MSTDNT_URLSIZE] = { 0 };
snprintf(url, MSTDNT_URLSIZE,
@ -93,7 +121,7 @@ int mastodont_get_account(mastodont_t* data,
NULL, 0,
NULL, 0,
CURLOPT_HTTPGET,
&acct_args, /* args */
acct, /* args */
mstdnt_account_callback, /* callback */
};