slon-project/slon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Everywhere: Update JSON API

Browse source
This commit is contained in:
Alec Murphy 2025-03-09 19:39:44 -04:00
parent 6a0ecc2bd2
commit d5a09373e4
15 changed files with 230 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Slon/Api/V1/Accounts.HC
View file

@ -3,7 +3,7 @@ extern U0 @slon_api_v1_statuses_query(SlonHttpSession* session, JsonArray* statu
JsonObject* @slon_accounts_default_relationship_object()
{
JsonObject* relationship = Json.CreateObject();
JsonObject* relationship = Json.CreateObject(slon_mem_task);
relationship->set("following", FALSE, JSON_BOOLEAN);
relationship->set("showing_reblogs", TRUE, JSON_BOOLEAN);
relationship->set("notifying", FALSE, JSON_BOOLEAN);
@ -28,7 +28,7 @@ JsonObject* @slon_accounts_create_local_for_remote_actor(SlonHttpSession* sessio
U8* id = @slon_api_generate_unique_id(session);
U8* created_at = @slon_api_timestamp_from_cdate(session, Now);
JsonObject* account = Json.CreateObject();
JsonObject* account = Json.CreateObject(slon_mem_task);
account->set("id", id, JSON_STRING);
account->set("created_at", created_at, JSON_STRING);
account->set("username", actor_object->@("preferredUsername"), JSON_STRING);
@ -60,8 +60,8 @@ JsonObject* @slon_accounts_create_local_for_remote_actor(SlonHttpSession* sessio
account->set("url", remote_actor, JSON_STRING);
account->set("remote_actor", remote_actor, JSON_STRING);
db->a("accounts")->append(Json.CreateItem(account, JSON_OBJECT));
// db->o("statuses")->set(acct->@("id"), Json.CreateArray(), JSON_ARRAY);
db->a("accounts")->append(account);
// db->o("statuses")->set(acct->@("id"), Json.CreateArray(slon_mem_task), JSON_ARRAY);
@slon_db_save_account_to_disk(account);
@slon_free(session, created_at);
@ -73,7 +73,7 @@ U0 @slon_api_v1_accounts_follow_request(U8* this_actor, U8* remote_actor)
{
U8 scratch_buffer[1024];
StrPrint(scratch_buffer, "%s/follow/%d", this_actor, Now);
JsonObject* follow_object = Json.CreateObject();
JsonObject* follow_object = Json.CreateObject(slon_mem_task);
follow_object->set("@context", "https://www.w3.org/ns/activitystreams", JSON_STRING);
follow_object->set("id", scratch_buffer, JSON_STRING);
follow_object->set("type", "Follow", JSON_STRING);
@ -81,8 +81,6 @@ U0 @slon_api_v1_accounts_follow_request(U8* this_actor, U8* remote_actor)
follow_object->set("object", remote_actor, JSON_STRING);
if (@slon_api_follow_fedi) {
@slon_api_follow_fedi(follow_object);
} else {
Json.Delete(follow_object);
}
}
@ -117,9 +115,9 @@ U0 @slon_api_v1_accounts_post(SlonHttpSession* session)
}
// add to my following
if (!db->o("following")->a(my_acct->@("username"))) {
db->o("following")->set(my_acct->@("username"), Json.CreateArray(), JSON_ARRAY);
db->o("following")->set(my_acct->@("username"), Json.CreateArray(slon_mem_task), JSON_ARRAY);
}
db->o("following")->a(my_acct->@("username"))->append(Json.CreateItem(acct->@("remote_actor"), JSON_STRING));
db->o("following")->a(my_acct->@("username"))->append(acct->@("remote_actor"), JSON_STRING);
@slon_db_save_following_to_disk;
// send Follow request
@slon_api_v1_accounts_follow_request(db->o("actors")->o((my_acct->@("username")))->@("id"), acct->@("remote_actor"));
@ -158,7 +156,7 @@ U0 @slon_api_v1_accounts_get(SlonHttpSession* session)
JsonObject* acct = NULL;
if (!StrICmp("relationships", session->path(3))) {
if (@slon_api_authorized(session)) {
JsonArray* relationships = Json.CreateArray();
JsonArray* relationships = Json.CreateArray(slon_mem_task);
JsonArray* relationship_of_ids = request_json->@("id");
JsonObject* target_account = NULL;
if (relationship_of_ids) {
@ -168,7 +166,7 @@ U0 @slon_api_v1_accounts_get(SlonHttpSession* session)
Bool followed_by = FALSE;
Bool following = FALSE;
if (target_account->@("remote_actor")) {
JsonObject* my_account = @slon_api_account_by_id(Json.Get(session->auth, "account_id"));
JsonObject* my_account = @slon_api_account_by_id(session->auth->@("account_id"));
JsonArray* my_followers = db->o("followers")->a(my_account->@("username"));
if (my_followers) {
for (i = 0; i < my_followers->length; i++) {
@ -192,13 +190,12 @@ U0 @slon_api_v1_accounts_get(SlonHttpSession* session)
relationship->set("id", target_account->@("id"), JSON_STRING);
relationship->set("following", following, JSON_BOOLEAN);
relationship->set("followed_by", followed_by, JSON_BOOLEAN);
relationships->append(Json.CreateItem(relationship, JSON_OBJECT));
relationships->append(relationship);
}
}
}
session->send(relationships);
Json.Delete(relationships);
return;
} else {
session->status(401);
@ -238,10 +235,9 @@ U0 @slon_api_v1_accounts_get(SlonHttpSession* session)
session->status(404);
} else {
// Return the Account profile
JsonObject* profile_object = Json.Clone(acct);
JsonObject* profile_object = Json.Clone(acct, slon_mem_task);
profile_object->unset("source");
session->send(profile_object);
Json.Delete(profile_object);
}
}
}
@ -278,7 +274,7 @@ U0 @slon_api_v1_accounts_patch(SlonHttpSession* session)
JsonObject* field_object;
MemSet(fields_attributes_indexes, NULL, sizeof(I64) * 16);
JsonArray* fields_array = Json.CreateArray();
JsonArray* fields_array = Json.CreateArray(slon_mem_task);
SlonCatboxUpload* cb = NULL;
U8* media_id = NULL;
U8* media_file_ext = NULL;
@ -354,9 +350,9 @@ U0 @slon_api_v1_accounts_patch(SlonHttpSession* session)
field_object = update_field_index->value;
field_object->set("verified_at", NULL, JSON_NULL);
AdamLog("before stringify\n");
AdamLog("%s\n", Json.Stringify(field_object));
AdamLog("%s\n", Json.Stringify(field_object, slon_mem_task));
AdamLog("after stringify\n");
fields_array->append(Json.CreateItem(field_object, JSON_OBJECT));
fields_array->append(field_object, JSON_OBJECT);
update_field_index = update_field_index->next;
}
}

10
Slon/Api/V1/Apps.HC
View file

@ -43,16 +43,16 @@ U0 @slon_api_v1_apps_post(SlonHttpSession* session)
request_scopes = String.Split(request_json->@("scopes"), ' ', &request_scopes_count);
}
JsonArray* scopes = Json.CreateArray();
JsonArray* scopes = Json.CreateArray(slon_mem_task);
I64 i;
for (i = 0; i < request_scopes_count; i++) {
scopes->append(Json.CreateItem(request_scopes[i], JSON_STRING));
scopes->append(request_scopes[i], JSON_STRING);
}
JsonArray* redirect_uris = Json.CreateArray();
redirect_uris->append(Json.CreateItem(request_json->@("redirect_uris"), JSON_STRING));
JsonArray* redirect_uris = Json.CreateArray(slon_mem_task);
redirect_uris->append(request_json->@("redirect_uris"), JSON_STRING);
JsonObject* credential_app = Json.CreateObject();
JsonObject* credential_app = Json.CreateObject(slon_mem_task);
credential_app->set("id", id, JSON_STRING);
credential_app->set("name", request_json->@("client_name"), JSON_STRING);
credential_app->set("website", request_json->@("website"), JSON_STRING);

42
Slon/Api/V1/Statuses.HC
View file

@ -7,13 +7,13 @@ JsonArray* @slon_api_v1_statuses_find_descendants_by_id(U8* id)
return NULL;
}
JsonArray* arr = Json.CreateArray();
JsonArray* arr = Json.CreateArray(slon_mem_task);
JsonObject* status = NULL;
JsonKey* key = db->o("statuses")->keys;
while (key) {
status = @slon_api_status_lookup_by_in_reply_to_id(id, key->value);
if (status) {
arr->append(Json.CreateItem(status, JSON_OBJECT));
arr->append(status);
}
key = key->next;
}
@ -56,7 +56,7 @@ U0 @slon_api_v1_statuses_query(SlonHttpSession* session, JsonArray* status_array
if (request_json->@("since_id") && StrLen(request_json->@("since_id")) > 0 && !min_id) {
min_id = Str2I64(request_json->@("since_id"));
}
JsonArray* statuses = Json.CreateArray();
JsonArray* statuses = Json.CreateArray(slon_mem_task);
JsonObject* status = NULL;
if (status_array && status_array->length) {
for (i = status_array->length - 1; i > -1; i--) {
@ -72,7 +72,7 @@ U0 @slon_api_v1_statuses_query(SlonHttpSession* session, JsonArray* status_array
if (min_id > 0 && status_id <= min_id) {
exclude_status = TRUE;
}
if (only_media && !Json.Get(status, "media_attachments")(JsonArray*)->length) {
if (only_media && !status->a("media_attachments")->length) {
exclude_status = TRUE;
}
if (exclude_replies && StrLen(status->@("in_reply_to_acct_id")) > 0 && StrICmp(account_id, status->@("in_reply_to_acct_id"))) {
@ -82,7 +82,7 @@ U0 @slon_api_v1_statuses_query(SlonHttpSession* session, JsonArray* status_array
exclude_status = TRUE;
}
if (!exclude_status) {
statuses->append(Json.CreateItem(status, JSON_OBJECT));
statuses->append(status);
count++;
}
if (limit > 0 && count >= limit) {
@ -91,7 +91,6 @@ U0 @slon_api_v1_statuses_query(SlonHttpSession* session, JsonArray* status_array
}
}
session->send(statuses);
Json.Delete(statuses);
}
U0 @slon_api_v1_statuses_delete(SlonHttpSession* session)
@ -121,7 +120,7 @@ U0 @slon_api_v1_statuses_delete(SlonHttpSession* session)
for (i = 0; i < statuses->length; i++) {
status = statuses->@(i);
if (!StrICmp(status->@("id"), id)) {
fedi_status = Json.Clone(status);
fedi_status = Json.Clone(status, slon_mem_task);
status->set("deleted", TRUE, JSON_BOOLEAN);
media_attachments = status->a("media_attachments");
if (db->o("settings")->@("catbox_userhash") && media_attachments && media_attachments->length) {
@ -174,8 +173,8 @@ U0 @slon_api_v1_statuses_get(SlonHttpSession* session)
if (@slon_api_authorized(session)) {
if (session->path_count() > 4 && !StrICmp("context", session->path(4))) {
JsonObject* context = Json.CreateObject();
context->set("ancestors", Json.CreateArray(), JSON_ARRAY);
JsonObject* context = Json.CreateObject(slon_mem_task);
context->set("ancestors", Json.CreateArray(slon_mem_task), JSON_ARRAY);
// Get ancestors
id = session->path(3);
@ -183,7 +182,7 @@ U0 @slon_api_v1_statuses_get(SlonHttpSession* session)
while (status && status->@("in_reply_to_id")) {
status = @slon_api_find_status_by_id(status->@("in_reply_to_id"), status->@("in_reply_to_acct_id"));
if (status) {
context->a("ancestors")->append(Json.CreateItem(status, JSON_OBJECT));
context->a("ancestors")->append(status);
}
}
@ -233,19 +232,19 @@ U0 @slon_api_v1_statuses_post(SlonHttpSession* session)
idempotency_key_already_seen = TRUE;
}
if (!idempotency_key_already_seen) {
Json.Set(db->o("idempotency_keys"), idempotency_key, Now, JSON_NUMBER);
db->o("idempotency_keys")->set(idempotency_key, Now, JSON_NUMBER);
}
id = @slon_api_generate_unique_id(session);
U8* created_at = @slon_api_timestamp_from_cdate(session, Now);
JsonObject* app_object = db->o("apps")->@(Json.Get(session->auth, "client_id"));
JsonObject* app_object = db->o("apps")->@(session->auth->@("client_id"));
JsonObject* status_app = Json.CreateObject();
JsonObject* status_app = Json.CreateObject(slon_mem_task);
status_app->set("name", app_object->@("name"), JSON_STRING);
status_app->set("website", app_object->@("website"), JSON_STRING);
JsonObject* account_object = Json.Clone(@slon_api_account_by_id(account_id));
JsonObject* account_object = Json.Clone(@slon_api_account_by_id(account_id), slon_mem_task);
account_object->unset("source");
// U8* language = request_json->@("language");
@ -271,7 +270,7 @@ U0 @slon_api_v1_statuses_post(SlonHttpSession* session)
// Mastodon iOS app lets us post with +: reblogs_count, favourites_count, emojis, tags, mentions
// IceCubesApp lets us post with +: media_attachments, replies_count, spoiler_text, sensitive
JsonObject* status = Json.CreateObject();
JsonObject* status = Json.CreateObject(slon_mem_task);
JsonObject* reply_to_status = NULL;
JsonArray* media_attachments = NULL;
String.Trim(request_json->@("status"));
@ -290,11 +289,11 @@ U0 @slon_api_v1_statuses_post(SlonHttpSession* session)
status->set("mentions", SLON_EMPTY_JSON_ARRAY, JSON_ARRAY);
if (request_json->@("media_ids") && request_json->a("media_ids")->length) {
I64 i;
media_attachments = Json.CreateArray();
media_attachments = Json.CreateArray(slon_mem_task);
for (i = 0; i < request_json->a("media_ids")->length; i++) {
U8* media_id = request_json->a("media_ids")->@(i);
if (media_id && db->o("media")->o(media_id)) {
media_attachments->append(Json.CreateItem(db->o("media")->o(media_id), JSON_OBJECT));
media_attachments->append(db->o("media")->o(media_id));
}
}
status->set("media_attachments", media_attachments, JSON_ARRAY);
@ -316,19 +315,12 @@ U0 @slon_api_v1_statuses_post(SlonHttpSession* session)
if (!idempotency_key_already_seen) {
@slon_api_create_status(status, account_id);
if (@slon_api_status_create_fedi) {
@slon_api_status_create_fedi(Json.Clone(status));
@slon_api_status_create_fedi(Json.Clone(status, slon_mem_task));
}
}
session->send(status);
if (media_attachments) {
Json.Delete(media_attachments);
}
Json.Delete(status_app);
Json.Delete(account_object);
Json.Delete(app_object);
@slon_free(session, uri);
@slon_free(session, url);
@slon_free(session, id);

6
Slon/Api/V2/Media.HC
View file

@ -36,14 +36,14 @@ U0 @slon_api_v2_media_post(SlonHttpSession* session)
FileWrite(scratch_buffer, file->buffer, file->size);
// Create media object
JsonObject* media_object = Json.CreateObject();
JsonObject* media_object = Json.CreateObject(slon_mem_task);
media_object->set("id", media_id, JSON_STRING);
media_object->set("type", "image", JSON_STRING);
media_object->set("url", NULL, JSON_NULL);
media_object->set("preview_url", NULL, JSON_NULL);
media_object->set("remote_url", NULL, JSON_NULL);
media_object->set("meta", Json.CreateObject(), JSON_OBJECT);
media_object->o("meta")->set("original", Json.CreateObject(), JSON_OBJECT);
media_object->set("meta", Json.CreateObject(slon_mem_task), JSON_OBJECT);
media_object->o("meta")->set("original", Json.CreateObject(slon_mem_task), JSON_OBJECT);
media_object->o("meta")->o("original")->set("width", width, JSON_NUMBER);
media_object->o("meta")->o("original")->set("height", height, JSON_NUMBER);
media_object->set("description", NULL, JSON_NULL);

17
Slon/Api/V2/Search.HC
View file

@ -28,7 +28,7 @@ JsonObject* @slon_api_v2_search_remote_account_from_webfinger(SlonHttpSession* s
}
U8* fetch_buffer = CAlloc(HTTP_FETCH_BUFFER_SIZE, slon_mem_task);
JsonObject* http_headers = Json.CreateObject();
JsonObject* http_headers = Json.CreateObject(slon_mem_task);
http_headers->set("accept", "application/json", JSON_STRING);
@http_response* resp = Http.Get(url, fetch_buffer, NULL, http_headers);
@ -50,7 +50,7 @@ JsonObject* @slon_api_v2_search_remote_account_from_webfinger(SlonHttpSession* s
Free(fetch_buffer);
JsonObject* webfinger_object = Json.Parse(resp->body.data);
JsonObject* webfinger_object = Json.Parse(resp->body.data, slon_mem_task);
if (!webfinger_object) {
@slon_log(LOG_HTTPD, "Error querying webfinger, object not present in response from remote server");
return NULL;
@ -94,7 +94,7 @@ JsonObject* @slon_api_v2_search_remote_account_from_webfinger(SlonHttpSession* s
return NULL;
}
JsonObject* actor_object = Json.Parse(resp->body.data);
JsonObject* actor_object = Json.Parse(resp->body.data, slon_mem_task);
JsonObject* account = @slon_accounts_create_local_for_remote_actor(session, actor_object, remote_actor, url);
Free(fetch_buffer);
@ -107,10 +107,10 @@ U0 @slon_api_v2_search_get(SlonHttpSession* session)
if (@slon_api_authorized(session)) {
// SLON_AUTH_ACCOUNT_ID
JsonObject* results = Json.CreateObject();
results->set("accounts", Json.CreateArray(), JSON_ARRAY);
results->set("statuses", Json.CreateArray(), JSON_ARRAY);
results->set("hashtags", Json.CreateArray(), JSON_ARRAY);
JsonObject* results = Json.CreateObject(slon_mem_task);
results->set("accounts", Json.CreateArray(slon_mem_task), JSON_ARRAY);
results->set("statuses", Json.CreateArray(slon_mem_task), JSON_ARRAY);
results->set("hashtags", Json.CreateArray(slon_mem_task), JSON_ARRAY);
U8* q = request_json->@("q");
if (!q) {
@ -138,7 +138,7 @@ U0 @slon_api_v2_search_get(SlonHttpSession* session)
remote_account = @slon_api_v2_search_remote_account_from_webfinger(session, at_fragments[0], at_fragments[1]);
}
if (remote_account) {
results->a("accounts")->append(Json.CreateItem(remote_account, JSON_OBJECT));
results->a("accounts")->append(remote_account);
}
break;
default:
@ -151,7 +151,6 @@ U0 @slon_api_v2_search_get(SlonHttpSession* session)
slon_api_v2_search_get_return:
session->send(results);
Json.Delete(results);
} else {
session->status(401);
}