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);
}

24
Slon/Http/AdminServer.HC
View file

@ -42,7 +42,7 @@ U0 @slon_admin_create_ap_actor(SlonHttpSession* session, JsonObject* acct)
U8* domain = db->o("instance")->@("uri");
U8* username = acct->@("username");
JsonObject* actor = Json.Clone(SLON_DEFAULT_ACTOR_OBJECT);
JsonObject* actor = Json.Clone(SLON_DEFAULT_ACTOR_OBJECT, slon_mem_task);
StrPrint(scratch_buffer, "https://%s/users/%s", domain, username);
actor->set("id", scratch_buffer, JSON_STRING);
@ -62,7 +62,7 @@ U0 @slon_admin_create_ap_actor(SlonHttpSession* session, JsonObject* acct)
actor->set("name", acct->@("display_name"), JSON_STRING);
actor->set("summary", acct->@("note"), JSON_STRING);
JsonObject* icon = Json.Parse("{\"type\":\"Image\"}");
JsonObject* icon = Json.Parse("{\"type\":\"Image\"}", slon_mem_task);
icon->set("url", acct->@("avatar"), JSON_STRING);
actor->set("icon", icon, JSON_OBJECT);
@ -74,7 +74,7 @@ U0 @slon_admin_create_ap_actor(SlonHttpSession* session, JsonObject* acct)
db->o("private_keys")->set(username, request_json->@("privatekey"), JSON_STRING);
JsonObject* publickey = Json.CreateObject();
JsonObject* publickey = Json.CreateObject(slon_mem_task);
StrPrint(scratch_buffer, "https://%s/users/%s#main-key", domain, username);
publickey->set("id", scratch_buffer, JSON_STRING);
StrPrint(scratch_buffer, "https://%s/users/%s", domain, username);
@ -94,8 +94,8 @@ U0 @slon_admin_create_account(SlonHttpSession* session)
U8* id = @slon_api_generate_unique_id(session);
U8* created_at = @slon_api_timestamp_from_cdate(session, Now);
JsonObject* acct = Json.CreateObject();
JsonObject* source = Json.CreateObject();
JsonObject* acct = Json.CreateObject(slon_mem_task);
JsonObject* source = Json.CreateObject(slon_mem_task);
acct->set("id", id, JSON_STRING);
acct->set("created_at", created_at, JSON_STRING);
@ -135,8 +135,8 @@ U0 @slon_admin_create_account(SlonHttpSession* session)
StrPrint(scratch_buffer, "https://%s/@%s", db->o("instance")->@("uri"), acct->@("username"));
acct->set("url", scratch_buffer, JSON_STRING);
db->a("accounts")->append(Json.CreateItem(acct, JSON_OBJECT));
db->o("statuses")->set(acct->@("id"), Json.CreateArray(), JSON_ARRAY);
db->a("accounts")->append(acct);
db->o("statuses")->set(acct->@("id"), Json.CreateArray(slon_mem_task), JSON_ARRAY);
@slon_admin_create_ap_actor(session, acct);
@slon_db_instance_update_user_count;
@ -180,7 +180,7 @@ U0 @slon_admin_settings_apps_get(SlonHttpSession* session, U8* buf)
no_warn scratch_buffer, request_json;
String.Append(buf, "settings/apps");
String.Append(buf, "<br><br>");
U8* tmp = Json.Stringify(db->o("apps"));
U8* tmp = Json.Stringify(db->o("apps"), slon_mem_task);
String.Append(buf, tmp);
Free(tmp);
}
@ -191,7 +191,7 @@ U0 @slon_admin_settings_oauth_get(SlonHttpSession* session, U8* buf)
no_warn scratch_buffer, request_json;
String.Append(buf, "settings/oauth");
String.Append(buf, "<br><br>");
U8* tmp = Json.Stringify(db->o("oauth"));
U8* tmp = Json.Stringify(db->o("oauth"), slon_mem_task);
String.Append(buf, tmp);
Free(tmp);
}
@ -267,17 +267,17 @@ U0 @slon_admin_manage_accounts(SlonHttpSession* session)
SLON_SCRATCH_BUFFER_AND_REQUEST_JSON
no_warn scratch_buffer;
JsonArray* results = Json.CreateArray();
JsonArray* results = Json.CreateArray(slon_mem_task);
I64 skip = Str2I64(request_json->@("skip"));
I64 limit = 10;
I64 i;
I64 count = 0;
JsonArray* accounts = db->a("accounts");
for (i = skip; i < accounts->length && i < skip + limit; i++) {
results->append(Json.CreateItem(accounts->@(i), JSON_OBJECT));
results->append(accounts->@(i));
++count;
}
JsonObject* o = Json.CreateObject();
JsonObject* o = Json.CreateObject(slon_mem_task);
o->set("total", accounts->length, JSON_NUMBER);
o->set("skip", skip, JSON_NUMBER);
o->set("count", count, JSON_NUMBER);

38
Slon/Http/Server.HC
View file

@ -1,3 +1,5 @@
#define SLON_DEBUG_PRINT_REQUEST_JSON IntNop;
SlonHttpBuffer* @slon_http_init_buffer(SlonHttpSession* session)
{
SlonHttpBuffer* buffer = @slon_calloc(session, sizeof(SlonHttpBuffer));
@ -64,7 +66,7 @@ SlonHttpRequest* @slon_http_init_request(SlonHttpSession* session)
{
SlonHttpRequest* request = @slon_calloc(session, sizeof(SlonHttpRequest));
request->buffer = @slon_http_init_buffer(session);
request->headers = Json.CreateObject();
request->headers = Json.CreateObject(slon_mem_task);
return request;
}
@ -72,7 +74,7 @@ SlonHttpResponse* @slon_http_init_response(SlonHttpSession* session)
{
SlonHttpResponse* response = @slon_calloc(session, sizeof(SlonHttpResponse));
response->buffer = @slon_http_init_buffer(session);
response->headers = Json.CreateObject();
response->headers = Json.CreateObject(slon_mem_task);
return response;
}
@ -211,7 +213,7 @@ U0 @slon_http_send_response(SlonHttpSession* session)
U8 scratch_buffer[256][4];
StrPrint(scratch_buffer[0], "%d", session->response->status_code);
StrPrint(scratch_buffer[1], "HTTP/1.0 %d %s\r\n", session->response->status_code, Json.Get(SLON_HTTP_STATUS_CODES, scratch_buffer[0]));
StrPrint(scratch_buffer[1], "HTTP/1.0 %d %s\r\n", session->response->status_code, SLON_HTTP_STATUS_CODES->@(scratch_buffer[0]));
@slon_http_buffer_append_string(buffer, scratch_buffer[1]);
JsonKey* key = session->response->headers->keys;
@ -299,7 +301,7 @@ slon_http_parse_request_headers:
@slon_http_rstrip_char_from_string(value, '\r');
*(StrFind(": ", raw_header_lines[i])) = NULL;
key = raw_header_lines[i];
Json.Set(session->request->headers, key, value, JSON_STRING);
session->request->headers->set(key, value, JSON_STRING);
}
}
@ -319,7 +321,7 @@ U0 @slon_http_debug_print_request(SlonHttpSession* session, Bool show_headers =
{
AdamLog("[httpd] %d => request: %s %s\n", session->s, session->request->verb, session->request->raw_path);
if (show_headers) {
U8* headers_stringified = Json.Stringify(session->request->headers);
U8* headers_stringified = Json.Stringify(session->request->headers, slon_mem_task);
AdamLog("[httpd] %d => headers: %s\n", session->s, headers_stringified);
Free(headers_stringified);
//@slon_free(session, headers_stringified);
@ -332,9 +334,9 @@ U0 @slon_http_debug_print_response(SlonHttpSession* session, Bool show_headers =
no_warn request_json;
StrPrint(scratch_buffer, "%d", session->response->status_code);
AdamLog("[httpd] %d <= response: %d %s\n", session->s, session->response->status_code, Json.Get(SLON_HTTP_STATUS_CODES, scratch_buffer));
AdamLog("[httpd] %d <= response: %d %s\n", session->s, session->response->status_code, SLON_HTTP_STATUS_CODES->@(scratch_buffer));
if (show_headers) {
U8* headers_stringified = Json.Stringify(session->response->headers);
U8* headers_stringified = Json.Stringify(session->response->headers, slon_mem_task);
AdamLog("[httpd] %d <= headers: %s\n", session->s, headers_stringified);
Free(headers_stringified);
//@slon_free(session, headers_stringified);
@ -354,9 +356,9 @@ U0 @slon_http_json_object_add_nested_value(SlonHttpSession* session, JsonObject*
if (StrOcc(name, '[') == 1 && String.EndsWith("[]", name)) {
StrFind("[]", name)[0] = NULL;
if (!obj->a(name)) {
obj->set(name, Json.CreateArray(), JSON_ARRAY);
obj->set(name, Json.CreateArray(slon_mem_task), JSON_ARRAY);
}
obj->a(name)->append(Json.CreateItem(value, type));
obj->a(name)->append(value, type);
return;
}
@ -375,7 +377,7 @@ U0 @slon_http_json_object_add_nested_value(SlonHttpSession* session, JsonObject*
String.Trim(keys[i], ']', TRIM_RIGHT);
if (!obj->o(keys[i])) {
// Create the empty objects as we traverse
obj->set(keys[i], Json.CreateObject(), JSON_OBJECT);
obj->set(keys[i], Json.CreateObject(slon_mem_task), JSON_OBJECT);
}
obj = obj->o(keys[i]);
}
@ -384,10 +386,10 @@ U0 @slon_http_json_object_add_nested_value(SlonHttpSession* session, JsonObject*
if (value_is_array_member) {
if (!obj->a(keys[i])) {
// Create the empty array if it does not exist
obj->set(keys[i], Json.CreateArray(), JSON_ARRAY);
obj->set(keys[i], Json.CreateArray(slon_mem_task), JSON_ARRAY);
}
// Append keys[i-1]: { keys[i]: [ ..., value ] }
obj->a(keys[i])->append(Json.CreateItem(value, type));
obj->a(keys[i])->append(value, type);
} else {
// Set keys[i-1]: { keys[i]: value }
obj->set(keys[i], value, type);
@ -404,7 +406,7 @@ I64 @slon_http_free_and_null(U64 ptr)
JsonObject* @slon_http_json_object_from_form_urlencoded_string(SlonHttpSession* session, U8* form_urlencoded_string)
{
JsonObject* obj = Json.CreateObject();
JsonObject* obj = Json.CreateObject(slon_mem_task);
U8* form_urlencoded_string_copy = @slon_strnew(session, form_urlencoded_string);
I64 raw_values_count = 0;
@ -441,7 +443,7 @@ JsonObject* @slon_http_json_object_from_multipart_form_data(SlonHttpSession* ses
SlonMultipartParser* mp = @slon_calloc(session, sizeof(SlonMultipartParser));
mp->consumed = FifoU8New(2048, slon_mem_task);
JsonObject* obj = Json.CreateObject();
JsonObject* obj = Json.CreateObject(slon_mem_task);
U8* boundary = StrFind("boundary=", session->header("content-type")) + 9;
String.Trim(boundary);
String.Trim(boundary, '"');
@ -527,7 +529,7 @@ JsonObject* @slon_http_json_object_from_multipart_form_data(SlonHttpSession* ses
switch (token) {
case ';':
case '\r':
name = @json_string_from_fifo(mp->consumed);
name = @json_string_from_fifo(mp->consumed, slon_mem_task);
String.Trim(name);
String.Trim(name, '"');
mp->state = SLON_MULTIPART_CONSUME_CONTENT_DISPOSITION_TEXT_OR_FILE;
@ -542,7 +544,7 @@ JsonObject* @slon_http_json_object_from_multipart_form_data(SlonHttpSession* ses
case SLON_MULTIPART_CONSUME_CONTENT_DISPOSITION_TEXT_OR_FILE:
switch (token) {
case '\n':
tmp = @json_string_from_fifo(mp->consumed);
tmp = @json_string_from_fifo(mp->consumed, slon_mem_task);
if (StrFind("filename=", tmp)) {
file = @slon_calloc(session, sizeof(SlonMultipartFile));
mp->state = SLON_MULTIPART_CONSUME_CONTENT_TYPE_HEADER;
@ -572,7 +574,7 @@ JsonObject* @slon_http_json_object_from_multipart_form_data(SlonHttpSession* ses
switch (token) {
case ';':
case '\r':
file->content_type = @json_string_from_fifo(mp->consumed);
file->content_type = @json_string_from_fifo(mp->consumed, slon_mem_task);
String.Trim(file->content_type);
String.Trim(file->content_type, '"');
mp->state = SLON_MULTIPART_SKIP_REMAINING_HEADERS;
@ -634,7 +636,7 @@ U0 @slon_http_parse_request_as_multipart_form_data(SlonHttpSession* session)
U0 @slon_http_parse_request_as_json(SlonHttpSession* session)
{
session->request->json = Json.Parse(session->request->data);
session->request->json = Json.Parse(session->request->data, slon_mem_task);
}
U0 @slon_http_handle_delete_request(SlonHttpSession* session)

82
Slon/Modules/ActivityPub.HC
View file

@ -126,7 +126,7 @@ Bool @slon_activitypub_http_signature_is_valid(SlonHttpSession* session, U8* use
return FALSE;
}
JsonObject* user_object = Json.Parse(resp->body.data);
JsonObject* user_object = Json.Parse(resp->body.data, slon_mem_task);
Free(fetch_buffer);
if (!user_object) {
@ -179,14 +179,12 @@ Bool @slon_activitypub_http_signature_is_valid(SlonHttpSession* session, U8* use
U8* der_buf = @base64_decode(pem_single_line, &der_buf_length);
// Cache the public key
JsonObject* cached_key = Json.CreateObject();
JsonObject* cached_key = Json.CreateObject(slon_mem_task);
cached_key->set("key", der_buf, JSON_NUMBER);
cached_key->set("length", der_buf_length, JSON_NUMBER);
db->o("public_keys")->set(keyId, cached_key, JSON_OBJECT);
@slon_free(session, pem_single_line);
Json.Delete(user_object);
}
// Calculate our signature string allocation
@ -286,14 +284,14 @@ U0 @slon_activitypub_users_get(SlonHttpSession* session)
return NULL;
}
JsonObject* http_headers = Json.CreateObject();
JsonObject* http_headers = Json.CreateObject(slon_mem_task);
U8 scratch_buffer[2048];
U8* request_object_s = NULL;
if (request_object) {
signatory = request_object->@("actor");
request_object_s = Json.Stringify(request_object);
request_object_s = Json.Stringify(request_object, slon_mem_task);
U8 content_hash[32];
calc_sha_256(content_hash, request_object_s, StrLen(request_object_s));
U8* computed_digest = @base64_encode(content_hash, 32);
@ -339,7 +337,7 @@ U0 @slon_activitypub_users_get(SlonHttpSession* session)
JsonObject* private_key_binary = db->o("private_keys_binary")->o(user);
if (!private_key_binary) {
I64 private_key_binary_size = 0;
private_key_binary = Json.CreateObject();
private_key_binary = Json.CreateObject(slon_mem_task);
private_key_binary->set("data", @base64_decode(db->o("private_keys")->@(user), &private_key_binary_size), JSON_OBJECT);
private_key_binary->set("size", private_key_binary_size, JSON_NUMBER);
db->o("private_keys_binary")->set(user, private_key_binary, JSON_OBJECT);
@ -397,7 +395,10 @@ U0 @slon_activitypub_users_get(SlonHttpSession* session)
Free(request_object_s);
}
resp->body.data[resp->body.length] = NULL;
AdamLog("code: %d\n", resp->status.code);
AdamLog(resp->body.data);
return resp;
// FIXME: Free url
@ -416,7 +417,7 @@ U0 @slon_activitypub_async_accept_request(JsonObject* o)
U8* this_actor = db->o("actors")->o(o->@("user"))->@("id");
StrPrint(scratch_buffer, "%s/accept/%d", this_actor, Now);
JsonObject* accept_object = Json.CreateObject();
JsonObject* accept_object = Json.CreateObject(slon_mem_task);
accept_object->set("@context", request->@("@context"), JSON_STRING);
accept_object->set("id", scratch_buffer, JSON_STRING);
accept_object->set("type", "Accept", JSON_STRING);
@ -427,7 +428,6 @@ U0 @slon_activitypub_async_accept_request(JsonObject* o)
StrPrint(scratch_buffer, "%s/inbox", o->@("actor_for_key_id"));
@slon_activitypub_signed_request(scratch_buffer, fetch_buffer, accept_object);
Free(fetch_buffer);
Json.Delete(accept_object);
}
U0 @slon_activitypub_async_create_status_to(JsonObject* status, U8* dest)
@ -440,7 +440,7 @@ U0 @slon_activitypub_async_create_status_to(JsonObject* status, U8* dest)
U8* this_actor = StrNew(status->@("uri"), slon_mem_task);
StrFind("/statuses/", this_actor)[0] = NULL;
JsonObject* create_object = Json.CreateObject();
JsonObject* create_object = Json.CreateObject(slon_mem_task);
JsonObject* reply_to_status = NULL;
create_object->set("@context", "https://www.w3.org/ns/activitystreams", JSON_STRING);
@ -449,19 +449,19 @@ U0 @slon_activitypub_async_create_status_to(JsonObject* status, U8* dest)
create_object->set("type", "Create", JSON_STRING);
create_object->set("actor", this_actor, JSON_STRING);
create_object->set("published", status->@("created_at"), JSON_STRING);
create_object->set("to", Json.Parse("[\"https://www.w3.org/ns/activitystreams#Public\"]"), JSON_ARRAY);
JsonArray* cc = Json.CreateArray();
create_object->set("to", Json.Parse("[\"https://www.w3.org/ns/activitystreams#Public\"]", slon_mem_task), JSON_ARRAY);
JsonArray* cc = Json.CreateArray(slon_mem_task);
StrPrint(scratch_buffer, "%s/followers", this_actor);
cc->append(Json.CreateItem(scratch_buffer, JSON_STRING));
cc->append(scratch_buffer, JSON_STRING);
create_object->set("cc", cc, JSON_ARRAY);
JsonObject* note_object = Json.CreateObject();
JsonObject* note_object = Json.CreateObject(slon_mem_task);
note_object->set("id", status->@("uri"), JSON_STRING);
note_object->set("type", "Note", JSON_STRING);
note_object->set("summary", NULL, JSON_NULL);
note_object->set("published", status->@("created_at"), JSON_STRING);
note_object->set("attributedTo", this_actor, JSON_STRING);
note_object->set("to", Json.Parse("[\"https://www.w3.org/ns/activitystreams#Public\"]"), JSON_ARRAY);
note_object->set("to", Json.Parse("[\"https://www.w3.org/ns/activitystreams#Public\"]", slon_mem_task), JSON_ARRAY);
note_object->set("cc", cc, JSON_ARRAY);
note_object->set("sensitive", status->@("sensitive"), JSON_BOOLEAN);
note_object->set("atomUri", status->@("uri"), JSON_STRING);
@ -476,24 +476,24 @@ U0 @slon_activitypub_async_create_status_to(JsonObject* status, U8* dest)
note_object->set("inReplyToAtomUri", NULL, JSON_NULL);
}
note_object->set("content", status->@("content"), JSON_STRING);
JsonObject* content_map = Json.CreateObject();
JsonObject* content_map = Json.CreateObject(slon_mem_task);
content_map->set("en", status->@("content"), JSON_STRING);
note_object->set("contentMap", content_map, JSON_OBJECT);
JsonArray* attachment_array = NULL;
if (status->@("media_attachments") && status->a("media_attachments")->length) {
attachment_array = Json.CreateArray();
attachment_array = Json.CreateArray(slon_mem_task);
JsonArray* media_attachments = status->a("media_attachments");
JsonObject* masto_attachment = NULL;
JsonObject* ap_attachment = NULL;
for (i = 0; i < media_attachments->length; i++) {
masto_attachment = media_attachments->@(i);
ap_attachment = Json.CreateObject();
ap_attachment = Json.CreateObject(slon_mem_task);
StrPrint(scratch_buffer, "image/%s", StrFind(".", StrFind("catbox.moe/", masto_attachment->@("url")) + 11) + 1);
ap_attachment->set("mediaType", scratch_buffer, JSON_STRING);
ap_attachment->set("url", masto_attachment->@("url"), JSON_STRING);
ap_attachment->set("width", masto_attachment->o("meta")->o("original")->@("width"), JSON_NUMBER);
ap_attachment->set("height", masto_attachment->o("meta")->o("original")->@("height"), JSON_NUMBER);
attachment_array->append(Json.CreateItem(ap_attachment, JSON_OBJECT));
attachment_array->append(ap_attachment, JSON_OBJECT);
}
note_object->set("attachment", attachment_array, JSON_ARRAY);
} else {
@ -509,10 +509,6 @@ U0 @slon_activitypub_async_create_status_to(JsonObject* status, U8* dest)
StrPrint(scratch_buffer, "%s/inbox", dest);
@slon_activitypub_signed_request(scratch_buffer, fetch_buffer, create_object);
Free(fetch_buffer);
if (attachment_array) {
Json.Delete(attachment_array);
}
Json.Delete(create_object);
}
U0 @slon_activitypub_async_create_status(JsonObject* status)
@ -535,16 +531,16 @@ U0 @slon_activitypub_async_delete_status_to(JsonObject* status, U8* dest)
U8* this_actor = StrNew(status->@("uri"), slon_mem_task);
StrFind("/statuses/", this_actor)[0] = NULL;
JsonObject* delete_object = Json.CreateObject();
JsonObject* delete_object = Json.CreateObject(slon_mem_task);
delete_object->set("@context", "https://www.w3.org/ns/activitystreams", JSON_STRING);
StrPrint(scratch_buffer, "%s#delete", status->@("uri"));
delete_object->set("id", scratch_buffer, JSON_STRING);
delete_object->set("type", "Delete", JSON_STRING);
delete_object->set("actor", this_actor, JSON_STRING);
delete_object->set("to", Json.Parse("[\"https://www.w3.org/ns/activitystreams#Public\"]"), JSON_ARRAY);
delete_object->set("to", Json.Parse("[\"https://www.w3.org/ns/activitystreams#Public\"]", slon_mem_task), JSON_ARRAY);
JsonObject* ts_object = Json.CreateObject();
JsonObject* ts_object = Json.CreateObject(slon_mem_task);
ts_object->set("id", status->@("uri"), JSON_STRING);
ts_object->set("type", "Tombstone", JSON_STRING);
ts_object->set("atomUri", status->@("uri"), JSON_STRING);
@ -554,7 +550,6 @@ U0 @slon_activitypub_async_delete_status_to(JsonObject* status, U8* dest)
StrPrint(scratch_buffer, "%s/inbox", dest);
@slon_activitypub_signed_request(scratch_buffer, fetch_buffer, delete_object);
Free(fetch_buffer);
Json.Delete(delete_object);
}
U0 @slon_activitypub_async_follow(JsonObject* follow)
@ -565,7 +560,6 @@ U0 @slon_activitypub_async_follow(JsonObject* follow)
StrPrint(scratch_buffer, "%s/inbox", follow->@("object"));
@slon_activitypub_signed_request(scratch_buffer, fetch_buffer, follow);
Free(fetch_buffer);
Json.Delete(follow);
}
U0 @slon_activitypub_async_delete_status(JsonObject* status)
@ -610,7 +604,7 @@ JsonObject* @slon_activitypub_get_account_for_remote_actor(SlonHttpSession* sess
if (account) {
return account;
}
account = Json.CreateObject();
account = Json.CreateObject(slon_mem_task);
HttpUrl* url = @http_parse_url(remote_actor);
if (!url) {
@ -619,7 +613,7 @@ JsonObject* @slon_activitypub_get_account_for_remote_actor(SlonHttpSession* sess
}
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);
@ -639,7 +633,7 @@ JsonObject* @slon_activitypub_get_account_for_remote_actor(SlonHttpSession* sess
return NULL;
}
JsonObject* actor_object = Json.Parse(resp->body.data);
JsonObject* actor_object = Json.Parse(resp->body.data, slon_mem_task);
account = @slon_accounts_create_local_for_remote_actor(session, actor_object, remote_actor, url);
Free(fetch_buffer);
@ -696,7 +690,7 @@ U0 @slon_activitypub_users_inbox(SlonHttpSession* session, U8* user)
}
}
@slon_db_save_statuses_to_disk;
request_object = Json.Clone(request_json);
request_object = Json.Clone(request_json, slon_mem_task);
}
if (!StrICmp("follow", request_json->@("type"))) {
@ -705,7 +699,7 @@ U0 @slon_activitypub_users_inbox(SlonHttpSession* session, U8* user)
return;
}
if (!db->o("followers")->@(user)) {
db->o("followers")->set(user, Json.CreateArray(), JSON_ARRAY);
db->o("followers")->set(user, Json.CreateArray(slon_mem_task), JSON_ARRAY);
}
followers = db->o("followers")->a(user);
for (i = 0; i < followers->length; i++) {
@ -714,12 +708,12 @@ U0 @slon_activitypub_users_inbox(SlonHttpSession* session, U8* user)
}
}
if (!already_following) {
followers->append(Json.CreateItem(request_json->@("actor"), JSON_STRING));
followers->append(request_json->@("actor"), JSON_STRING);
account->set("followers_count", account->@("followers_count") + 1);
@slon_db_save_followers_to_disk;
@slon_db_save_account_to_disk(account);
}
request_object = Json.Clone(request_json);
request_object = Json.Clone(request_json, slon_mem_task);
}
if (!StrICmp("create", request_json->@("type"))) {
@ -807,10 +801,10 @@ U0 @slon_activitypub_users_inbox(SlonHttpSession* session, U8* user)
}
}
JsonObject* new_status = Json.CreateObject();
JsonObject* new_status = Json.CreateObject(slon_mem_task);
U8* id = @slon_api_generate_unique_id(session);
JsonArray* media_attachments = Json.CreateArray();
JsonArray* media_attachments = Json.CreateArray(slon_mem_task);
if (request_json->o("object")->@("attachment")) {
JsonObject* attachment_item = NULL;
JsonObject* media_attachment = NULL;
@ -819,15 +813,15 @@ U0 @slon_activitypub_users_inbox(SlonHttpSession* session, U8* user)
for (i = 0; i < attachment_array->length; i++) {
attachment_item = attachment_array->o(i);
if (attachment_item && attachment_item->@("mediaType") && String.BeginsWith("image", attachment_item->@("mediaType"))) {
media_attachment = Json.CreateObject();
media_meta = Json.CreateObject();
media_attachment = Json.CreateObject(slon_mem_task);
media_meta = Json.CreateObject(slon_mem_task);
media_attachment->set("id", "", JSON_STRING);
media_attachment->set("type", "image", JSON_STRING);
media_attachment->set("url", attachment_item->@("url"), JSON_STRING);
media_attachment->set("preview_url", NULL, JSON_NULL);
media_attachment->set("remote_url", NULL, JSON_NULL);
if (attachment_item->@("width") && attachment_item->@("height")) {
media_meta->set("original", Json.CreateObject(), JSON_OBJECT);
media_meta->set("original", Json.CreateObject(slon_mem_task), JSON_OBJECT);
media_meta->o("original")->set("width", attachment_item->@("width"), JSON_NUMBER);
media_meta->o("original")->set("height", attachment_item->@("height"), JSON_NUMBER);
}
@ -842,7 +836,7 @@ U0 @slon_activitypub_users_inbox(SlonHttpSession* session, U8* user)
media_attachment->set("blurhash", NULL, JSON_NULL);
}
media_attachment->set("meta", media_meta, JSON_OBJECT);
media_attachments->append(Json.CreateItem(media_attachment, JSON_OBJECT));
media_attachments->append(media_attachment);
}
}
}
@ -876,7 +870,7 @@ U0 @slon_activitypub_users_inbox(SlonHttpSession* session, U8* user)
@slon_api_create_status(new_status, remote_account->@("id"), user);
@slon_free(session, id);
request_object = Json.CreateObject();
request_object = Json.CreateObject(slon_mem_task);
request_object->set("@context", "https://www.w3.org/ns/activitystreams", JSON_STRING);
request_object->set("id", request_json->@("id"), JSON_STRING);
request_object->set("type", request_json->@("type"), JSON_STRING);
@ -900,11 +894,11 @@ U0 @slon_activitypub_users_inbox(SlonHttpSession* session, U8* user)
}
}
@slon_db_save_status_to_disk(status);
request_object = Json.Clone(request_json);
request_object = Json.Clone(request_json, slon_mem_task);
}
if (request_object) {
JsonObject* o = Json.CreateObject();
JsonObject* o = Json.CreateObject(slon_mem_task);
o->set("actor_for_key_id", session->actor_for_key_id, JSON_STRING);
o->set("user", user, JSON_STRING);
o->set("request", request_object, JSON_OBJECT);

20
Slon/Modules/Api.HC
View file

@ -1,5 +1,5 @@
#define SLON_API_LOCAL_TIME_OFFSET 3550
#define SLON_AUTH_ACCOUNT_ID U8* account_id = Json.Get(session->auth, "account_id");
#define SLON_AUTH_ACCOUNT_ID U8* account_id = session->auth->@("account_id");
extern @http_response* @slon_activitypub_signed_request(U8* url_string, U8* fetch_buffer, JsonObject* request_object = NULL, I64 verb = SLON_HTTP_VERB_POST, U8* signatory = NULL);
@ -354,14 +354,14 @@ U0 @slon_api_create_status(JsonObject* status, U8* account_id, U8* to_ap_user =
return;
}
if (!db->o("statuses")->a(account_id)) {
db->o("statuses")->set(account_id, Json.CreateArray(), JSON_ARRAY);
db->o("statuses")->set(account_id, Json.CreateArray(slon_mem_task), JSON_ARRAY);
}
db->o("statuses")->a(account_id)->append(Json.CreateItem(status, JSON_OBJECT));
db->o("statuses")->a(account_id)->append(status);
@slon_db_save_status_to_disk(status);
@slon_db_instance_increment_status_count;
@slon_db_save_instance_to_disk;
JsonObject* status_item = Json.CreateObject();
JsonObject* status_item = Json.CreateObject(slon_mem_task);
status_item->set("account_id", account_id, JSON_STRING);
status_item->set("status_id", status->@("id"), JSON_STRING);
@ -369,18 +369,18 @@ U0 @slon_api_create_status(JsonObject* status, U8* account_id, U8* to_ap_user =
JsonObject* acct = @slon_api_account_by_id(account_id);
if (!acct->@("remote_actor") && !StrICmp("public", status->@("visibility"))) {
if (!db->o("timelines")->a("public")) {
db->o("timelines")->set("public", Json.CreateArray(), JSON_ARRAY);
db->o("timelines")->set("public", Json.CreateArray(slon_mem_task), JSON_ARRAY);
}
db->o("timelines")->a("public")->append(Json.CreateItem(status_item, JSON_OBJECT));
db->o("timelines")->a("public")->append(status_item);
}
// If account_id is a remote account, and we have an ActivityPub user, post to their timeline
if (acct->@("remote_actor") && to_ap_user) {
JsonObject* acct_for_ap_user = @slon_api_account_by_username(to_ap_user);
if (acct_for_ap_user) {
if (!db->o("timelines")->o("home")->a(acct_for_ap_user->@("id"))) {
db->o("timelines")->o("home")->set(acct_for_ap_user->@("id"), Json.CreateArray(), JSON_ARRAY);
db->o("timelines")->o("home")->set(acct_for_ap_user->@("id"), Json.CreateArray(slon_mem_task), JSON_ARRAY);
}
db->o("timelines")->o("home")->a(acct_for_ap_user->@("id"))->append(Json.CreateItem(status_item, JSON_OBJECT));
db->o("timelines")->o("home")->a(acct_for_ap_user->@("id"))->append(status_item);
}
}
@slon_db_save_timelines_to_disk;
@ -411,7 +411,7 @@ JsonArray* @slon_api_status_array_from_timeline(JsonArray* timeline)
if (!timeline) {
return NULL;
}
JsonArray* status_array = Json.CreateArray();
JsonArray* status_array = Json.CreateArray(slon_mem_task);
JsonObject* timeline_item = NULL;
JsonObject* status = NULL;
I64 i;
@ -419,7 +419,7 @@ JsonArray* @slon_api_status_array_from_timeline(JsonArray* timeline)
timeline_item = timeline->@(i);
status = @slon_api_get_timeline_item(timeline_item);
if (status) {
status_array->append(Json.CreateItem(status, JSON_OBJECT));
status_array->append(status);
}
}
return status_array;

143
Slon/Modules/Db.HC
View file

@ -1,22 +1,24 @@
CTask* slon_db_mem_task = Spawn(&@slon_mem_task_loop, , "SlonDbMemTask");
#define SLON_MISSING_ACCOUNT_AVATAR "https://slon-project.org/images/avatar-missing.png"
#define SLON_DB_PATH "A:/db"
#define SLON_MEDIA_PATH "B:/media"
JsonObject* db = Json.CreateObject();
JsonObject* db = Json.CreateObject(slon_db_mem_task);
U0 @slon_db_load_accounts_from_disk()
{
JsonArray* accounts = Json.CreateArray();
JsonArray* accounts = Json.CreateArray(slon_db_mem_task);
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/accounts/*.json", SLON_DB_PATH);
CDirEntry* files = FilesFind(scratch_buffer);
CDirEntry* de = files;
JsonObject* account = NULL;
while (de) {
account = Json.ParseFile(de->full_name);
account = Json.ParseFile(de->full_name, slon_db_mem_task);
if (account) {
accounts->append(Json.CreateItem(account, JSON_OBJECT));
accounts->append(account);
}
de = de->next;
}
@ -28,47 +30,47 @@ U0 @slon_db_load_actors_from_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/actors.json", SLON_DB_PATH);
db->set("actors", Json.ParseFile(scratch_buffer), JSON_OBJECT);
db->set("actors", Json.ParseFile(scratch_buffer, slon_db_mem_task), JSON_OBJECT);
}
U0 @slon_db_load_apps_from_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/apps.json", SLON_DB_PATH);
db->set("apps", Json.ParseFile(scratch_buffer), JSON_OBJECT);
db->set("apps", Json.ParseFile(scratch_buffer, slon_db_mem_task), JSON_OBJECT);
}
U0 @slon_db_load_instance_from_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/instance.json", SLON_DB_PATH);
db->set("instance", Json.ParseFile(scratch_buffer), JSON_OBJECT);
db->set("instance", Json.ParseFile(scratch_buffer, slon_db_mem_task), JSON_OBJECT);
}
U0 @slon_db_load_oauth_from_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/oauth.json", SLON_DB_PATH);
db->set("oauth", Json.ParseFile(scratch_buffer), JSON_OBJECT);
db->set("oauth", Json.ParseFile(scratch_buffer, slon_db_mem_task), JSON_OBJECT);
}
U0 @slon_db_load_private_keys_from_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/private_keys.json", SLON_DB_PATH);
db->set("private_keys", Json.ParseFile(scratch_buffer), JSON_OBJECT);
db->set("private_keys", Json.ParseFile(scratch_buffer, slon_db_mem_task), JSON_OBJECT);
}
U0 @slon_db_load_followers_from_disk()
{
JsonObject* followers = Json.CreateObject();
JsonObject* followers = Json.CreateObject(slon_db_mem_task);
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/followers/*.json", SLON_DB_PATH);
CDirEntry* files = FilesFind(scratch_buffer);
CDirEntry* de = files;
JsonArray* follower_array = NULL;
while (de) {
follower_array = Json.ParseFile(de->full_name);
follower_array = Json.ParseFile(de->full_name, slon_db_mem_task);
if (follower_array) {
StrFind(".json", de->name)[0] = NULL;
followers->set(de->name, follower_array, JSON_ARRAY);
@ -81,14 +83,14 @@ U0 @slon_db_load_followers_from_disk()
U0 @slon_db_load_following_from_disk()
{
JsonObject* following = Json.CreateObject();
JsonObject* following = Json.CreateObject(slon_db_mem_task);
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/following/*.json", SLON_DB_PATH);
CDirEntry* files = FilesFind(scratch_buffer);
CDirEntry* de = files;
JsonArray* following_array = NULL;
while (de) {
following_array = Json.ParseFile(de->full_name);
following_array = Json.ParseFile(de->full_name, slon_db_mem_task);
if (following_array) {
StrFind(".json", de->name)[0] = NULL;
following->set(de->name, following_array, JSON_ARRAY);
@ -101,14 +103,14 @@ U0 @slon_db_load_following_from_disk()
U0 @slon_db_load_markers_from_disk()
{
JsonObject* markers = Json.CreateObject();
JsonObject* markers = Json.CreateObject(slon_db_mem_task);
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/markers/*.json", SLON_DB_PATH);
CDirEntry* files = FilesFind(scratch_buffer);
CDirEntry* de = files;
JsonArray* marker_array = NULL;
while (de) {
marker_array = Json.ParseFile(de->full_name);
marker_array = Json.ParseFile(de->full_name, slon_db_mem_task);
if (marker_array) {
StrFind(".json", de->name)[0] = NULL;
markers->set(de->name, marker_array, JSON_ARRAY);
@ -123,19 +125,19 @@ U0 @slon_db_load_settings_from_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/settings.json", SLON_DB_PATH);
db->set("settings", Json.ParseFile(scratch_buffer), JSON_OBJECT);
db->set("settings", Json.ParseFile(scratch_buffer, slon_db_mem_task), JSON_OBJECT);
}
U0 @slon_db_load_statuses_from_disk()
{
JsonObject* statuses = Json.CreateObject();
JsonObject* statuses = Json.CreateObject(slon_db_mem_task);
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/statuses/*.json", SLON_DB_PATH);
CDirEntry* files = FilesFind(scratch_buffer);
CDirEntry* de = files;
JsonArray* status_array = NULL;
while (de) {
status_array = Json.ParseFile(de->full_name);
status_array = Json.ParseFile(de->full_name, slon_db_mem_task);
if (status_array) {
StrFind(".json", de->name)[0] = NULL;
statuses->set(de->name, status_array, JSON_ARRAY);
@ -148,16 +150,16 @@ U0 @slon_db_load_statuses_from_disk()
U0 @slon_db_load_timelines_from_disk()
{
JsonObject* timelines = Json.CreateObject();
JsonObject* timelines = Json.CreateObject(slon_db_mem_task);
JsonObject* home_statuses = Json.CreateObject();
JsonObject* home_statuses = Json.CreateObject(slon_db_mem_task);
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/timelines/home/*.json", SLON_DB_PATH);
CDirEntry* files = FilesFind(scratch_buffer);
CDirEntry* de = files;
JsonArray* status_array = NULL;
while (de) {
status_array = Json.ParseFile(de->full_name);
status_array = Json.ParseFile(de->full_name, slon_db_mem_task);
if (status_array) {
StrFind(".json", de->name)[0] = NULL;
home_statuses->set(de->name, status_array, JSON_ARRAY);
@ -167,7 +169,7 @@ U0 @slon_db_load_timelines_from_disk()
DirTreeDel(files);
timelines->set("home", home_statuses, JSON_OBJECT);
StrPrint(scratch_buffer, "%s/timelines/public.json", SLON_DB_PATH);
timelines->set("public", Json.ParseFile(scratch_buffer), JSON_ARRAY);
timelines->set("public", Json.ParseFile(scratch_buffer, slon_db_mem_task), JSON_ARRAY);
db->set("timelines", timelines, JSON_OBJECT);
}
@ -176,7 +178,7 @@ U0 @slon_db_save_account_to_disk(JsonObject* account)
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/accounts/%s.json", SLON_DB_PATH, account->@("id"));
Json.DumpToFile(scratch_buffer, account);
Json.DumpToFile(scratch_buffer, account, slon_db_mem_task);
}
U0 @slon_db_save_accounts_to_disk()
@ -188,7 +190,7 @@ U0 @slon_db_save_accounts_to_disk()
for (i = 0; i < accounts->length; i++) {
account = accounts->o(i);
StrPrint(scratch_buffer, "%s/accounts/%s.json", SLON_DB_PATH, account->@("id"));
Json.DumpToFile(scratch_buffer, account);
Json.DumpToFile(scratch_buffer, account, slon_db_mem_task);
}
}
@ -196,35 +198,35 @@ U0 @slon_db_save_actors_to_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/actors.json", SLON_DB_PATH);
Json.DumpToFile(scratch_buffer, db->o("actors"));
Json.DumpToFile(scratch_buffer, db->o("actors"), slon_db_mem_task);
}
U0 @slon_db_save_apps_to_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/apps.json", SLON_DB_PATH);
Json.DumpToFile(scratch_buffer, db->o("apps"));
Json.DumpToFile(scratch_buffer, db->o("apps"), slon_db_mem_task);
}
U0 @slon_db_save_instance_to_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/instance.json", SLON_DB_PATH);
Json.DumpToFile(scratch_buffer, db->o("instance"));
Json.DumpToFile(scratch_buffer, db->o("instance"), slon_db_mem_task);
}
U0 @slon_db_save_oauth_to_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/oauth.json", SLON_DB_PATH);
Json.DumpToFile(scratch_buffer, db->o("oauth"));
Json.DumpToFile(scratch_buffer, db->o("oauth"), slon_db_mem_task);
}
U0 @slon_db_save_private_keys_to_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/private_keys.json", SLON_DB_PATH);
Json.DumpToFile(scratch_buffer, db->o("private_keys"));
Json.DumpToFile(scratch_buffer, db->o("private_keys"), slon_db_mem_task);
}
U0 @slon_db_save_followers_to_disk()
@ -233,7 +235,7 @@ U0 @slon_db_save_followers_to_disk()
JsonKey* key = db->o("followers")->keys;
while (key) {
StrPrint(scratch_buffer, "%s/followers/%s.json", SLON_DB_PATH, key->name);
Json.DumpToFile(scratch_buffer, key->value);
Json.DumpToFile(scratch_buffer, key->value, slon_db_mem_task);
key = key->next;
}
}
@ -244,7 +246,7 @@ U0 @slon_db_save_following_to_disk()
JsonKey* key = db->o("following")->keys;
while (key) {
StrPrint(scratch_buffer, "%s/following/%s.json", SLON_DB_PATH, key->name);
Json.DumpToFile(scratch_buffer, key->value);
Json.DumpToFile(scratch_buffer, key->value, slon_db_mem_task);
key = key->next;
}
}
@ -255,7 +257,7 @@ U0 @slon_db_save_markers_to_disk()
JsonKey* key = db->o("markers")->keys;
while (key) {
StrPrint(scratch_buffer, "%s/markers/%s.json", SLON_DB_PATH, key->name);
Json.DumpToFile(scratch_buffer, key->value);
Json.DumpToFile(scratch_buffer, key->value, slon_db_mem_task);
key = key->next;
}
}
@ -264,7 +266,7 @@ U0 @slon_db_save_settings_to_disk()
{
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/settings.json", SLON_DB_PATH);
Json.DumpToFile(scratch_buffer, db->o("settings"));
Json.DumpToFile(scratch_buffer, db->o("settings"), slon_db_mem_task);
}
U0 @slon_db_save_status_to_disk(JsonObject* status)
@ -272,7 +274,7 @@ U0 @slon_db_save_status_to_disk(JsonObject* status)
// NOTE: This will commit all statuses to disk for the account specified in the status.
U8 scratch_buffer[256];
StrPrint(scratch_buffer, "%s/statuses/%s.json", SLON_DB_PATH, status->o("account")->@("id"));
Json.DumpToFile(scratch_buffer, db->o("statuses")->a(status->o("account")->@("id")));
Json.DumpToFile(scratch_buffer, db->o("statuses")->a(status->o("account")->@("id")), slon_db_mem_task);
}
U0 @slon_db_save_statuses_to_disk()
@ -282,7 +284,7 @@ U0 @slon_db_save_statuses_to_disk()
JsonKey* key = db->o("statuses")->keys;
while (key) {
StrPrint(scratch_buffer, "%s/statuses/%s.json", SLON_DB_PATH, key->name);
Json.DumpToFile(scratch_buffer, key->value);
Json.DumpToFile(scratch_buffer, key->value, slon_db_mem_task);
key = key->next;
}
}
@ -293,11 +295,11 @@ U0 @slon_db_save_timelines_to_disk()
JsonKey* key = db->o("timelines")->o("home")->keys;
while (key) {
StrPrint(scratch_buffer, "%s/timelines/home/%s.json", SLON_DB_PATH, key->name);
Json.DumpToFile(scratch_buffer, key->value);
Json.DumpToFile(scratch_buffer, key->value, slon_db_mem_task);
key = key->next;
}
StrPrint(scratch_buffer, "%s/timelines/public.json", SLON_DB_PATH);
Json.DumpToFile(scratch_buffer, db->o("timelines")->a("public"));
Json.DumpToFile(scratch_buffer, db->o("timelines")->a("public"), slon_db_mem_task);
}
U0 @slon_db_save_to_disk()
@ -318,28 +320,28 @@ U0 @slon_db_save_to_disk()
U0 @slon_db_load_from_defaults()
{
db->set("accounts", Json.CreateArray(), JSON_ARRAY);
db->set("actors", Json.CreateObject(), JSON_OBJECT);
db->set("apps", Json.CreateObject(), JSON_OBJECT);
db->set("idempotency_keys", Json.CreateObject(), JSON_OBJECT);
db->set("private_keys", Json.CreateObject(), JSON_OBJECT);
db->set("private_keys_binary", Json.CreateObject(), JSON_OBJECT);
db->set("public_keys", Json.CreateObject(), JSON_OBJECT);
db->set("followers", Json.CreateObject(), JSON_OBJECT);
db->set("following", Json.CreateObject(), JSON_OBJECT);
db->set("instance", Json.ParseFile("M:/Slon/Static/defaults/instance.json"), JSON_OBJECT);
db->set("markers", Json.CreateObject(), JSON_OBJECT);
db->set("media", Json.CreateObject(), JSON_OBJECT);
db->set("settings", Json.CreateObject(), JSON_OBJECT);
db->set("statuses", Json.CreateObject(), JSON_OBJECT);
db->set("timelines", Json.CreateObject(), JSON_OBJECT);
db->o("timelines")->set("home", Json.CreateObject(), JSON_OBJECT);
db->o("timelines")->set("public", Json.CreateArray(), JSON_ARRAY);
JsonObject* oauth = Json.CreateObject();
oauth->set("codes", Json.CreateObject(), JSON_OBJECT);
oauth->set("requests", Json.CreateObject(), JSON_OBJECT);
oauth->set("responses", Json.CreateObject(), JSON_OBJECT);
oauth->set("tokens", Json.CreateObject(), JSON_OBJECT);
db->set("accounts", Json.CreateArray(slon_db_mem_task), JSON_ARRAY);
db->set("actors", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("apps", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("idempotency_keys", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("private_keys", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("private_keys_binary", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("public_keys", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("followers", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("following", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("instance", Json.ParseFile("M:/Slon/Static/defaults/instance.json", slon_db_mem_task), JSON_OBJECT);
db->set("markers", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("media", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("settings", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("statuses", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("timelines", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->o("timelines")->set("home", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->o("timelines")->set("public", Json.CreateArray(slon_db_mem_task), JSON_ARRAY);
JsonObject* oauth = Json.CreateObject(slon_db_mem_task);
oauth->set("codes", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
oauth->set("requests", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
oauth->set("responses", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
oauth->set("tokens", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("oauth", oauth, JSON_OBJECT);
db->set("setup", FALSE, JSON_BOOLEAN);
}
@ -349,15 +351,15 @@ U0 @slon_db_load_from_disk()
@slon_db_load_accounts_from_disk();
@slon_db_load_actors_from_disk();
@slon_db_load_apps_from_disk();
db->set("idempotency_keys", Json.CreateObject(), JSON_OBJECT);
db->set("idempotency_keys", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
@slon_db_load_private_keys_from_disk();
db->set("private_keys_binary", Json.CreateObject(), JSON_OBJECT);
db->set("public_keys", Json.CreateObject(), JSON_OBJECT);
db->set("private_keys_binary", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
db->set("public_keys", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
@slon_db_load_followers_from_disk();
@slon_db_load_following_from_disk();
@slon_db_load_instance_from_disk();
@slon_db_load_markers_from_disk();
db->set("media", Json.CreateObject(), JSON_OBJECT);
db->set("media", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
@slon_db_load_oauth_from_disk();
@slon_db_load_settings_from_disk();
@slon_db_load_statuses_from_disk();
@ -404,6 +406,13 @@ U0 @slon_db_actors_update_user(JsonObject* acct)
@slon_db_save_actors_to_disk;
}
JsonObject* @slon_db_accounts_add(JsonObject* acct)
{
db->a("accounts")->append(Json.Clone(acct, slon_db_mem_task));
@slon_db_save_account_to_disk(acct);
return acct;
}
U0 @slon_db_init()
{
if (FileFind(SLON_DB_PATH)) {
@ -417,8 +426,8 @@ U0 @slon_db_init()
@slon_db_init;
JsonArray* SLON_EMPTY_JSON_ARRAY = Json.CreateArray();
JsonObject* SLON_EMPTY_JSON_OBJECT = Json.CreateObject();
JsonArray* SLON_EMPTY_JSON_ARRAY = Json.CreateArray(slon_db_mem_task);
JsonObject* SLON_EMPTY_JSON_OBJECT = Json.CreateObject(slon_db_mem_task);
JsonObject* SLON_DEFAULT_ACCT_OBJECT = Json.ParseFile("M:/Slon/Static/defaults/account.json");
JsonObject* SLON_DEFAULT_ACTOR_OBJECT = Json.ParseFile("M:/Slon/Static/defaults/actor.json");
JsonObject* SLON_DEFAULT_ACCT_OBJECT = Json.ParseFile("M:/Slon/Static/defaults/account.json", slon_db_mem_task);
JsonObject* SLON_DEFAULT_ACTOR_OBJECT = Json.ParseFile("M:/Slon/Static/defaults/actor.json", slon_db_mem_task);

15
Slon/Modules/Http.HC
View file

@ -24,8 +24,8 @@
U8 scratch_buffer[256]; \
JsonObject* request_json = @slon_http_request_json(session);
JsonObject* SLON_HTTP_STATUS_CODES = Json.ParseFile("M:/Slon/Settings/status_codes.json");
JsonArray* SLON_TLDS = Json.ParseFile("M:/Slon/Settings/tlds.json");
JsonObject* SLON_HTTP_STATUS_CODES = Json.ParseFile("M:/Slon/Settings/status_codes.json", slon_mem_task);
JsonArray* SLON_TLDS = Json.ParseFile("M:/Slon/Settings/tlds.json", slon_mem_task);
I64 tld_cnt = 0;
U8** tld_array = CAlloc(sizeof(U8*) * SLON_TLDS->length);
@ -175,10 +175,11 @@ JsonObject* @slon_http_request_json(SlonHttpSession* session)
U0 @slon_http_set_header(SlonHttpSession* session, U8* key, U8* value)
{
JsonObject* headers = session->response->headers;
if (!StrICmp(value, "")) {
Json.Unset(session->response->headers, key);
headers->unset(key);
} else {
Json.Set(session->response->headers, key, value, JSON_STRING);
headers->set(key, value, JSON_STRING);
}
}
@ -192,7 +193,7 @@ U0 @slon_http_send_ap_json(SlonHttpSession* session, U64 json)
// a stringified copy of "json" is created, a strnew is sent, we clean up stringified copy, sender cleans up "json"
session->status(200);
session->content_type("application/activity+json; charset=utf-8");
U8* json_string = Json.Stringify(json);
U8* json_string = Json.Stringify(json, slon_mem_task);
session->response->data = @slon_strnew(session, json_string);
session->response->size = StrLen(session->response->data);
Free(json_string);
@ -203,7 +204,7 @@ U0 @slon_http_send_json(SlonHttpSession* session, U64 json)
// a stringified copy of "json" is created, a strnew is sent, we clean up stringified copy, sender cleans up "json"
session->status(200);
session->content_type("application/json; charset=utf-8");
U8* json_string = Json.Stringify(json);
U8* json_string = Json.Stringify(json, slon_mem_task);
session->response->data = @slon_strnew(session, json_string);
session->response->size = StrLen(session->response->data);
Free(json_string);
@ -297,7 +298,7 @@ I64 @slon_http_request_verb(SlonHttpSession* session, Bool return_str = FALSE)
U8* @slon_http_request_header(SlonHttpSession* session, U8* key)
{
U64 value = Json.Get(session->request->headers, key);
U64 value = session->request->headers->@(key);
if (!value)
return "";
return value;

15
Slon/Modules/NodeInfo.HC
View file

@ -10,24 +10,23 @@ U0 @slon_nodeinfo(SlonHttpSession* session)
U0 @slon_nodeinfo_20(SlonHttpSession* session)
{
JsonObject* nodeinfo = Json.CreateObject();
JsonObject* nodeinfo = Json.CreateObject(slon_mem_task);
nodeinfo->set("version", "2.0", JSON_STRING);
nodeinfo->set("software", Json.CreateObject(), JSON_OBJECT);
nodeinfo->set("software", Json.CreateObject(slon_mem_task), JSON_OBJECT);
nodeinfo->o("software")->set("name", "slon", JSON_STRING);
nodeinfo->o("software")->set("version", db->o("instance")->@("version"), JSON_STRING);
nodeinfo->set("protocols", Json.Parse("[\"activitypub\"]"), JSON_ARRAY);
nodeinfo->set("services", Json.Parse("{\"outbound\":[],\"inbound\":[]}"), JSON_OBJECT);
nodeinfo->set("usage", Json.CreateObject(), JSON_OBJECT);
nodeinfo->o("usage")->set("users", Json.CreateObject(), JSON_OBJECT);
nodeinfo->set("protocols", Json.Parse("[\"activitypub\"]", slon_mem_task), JSON_ARRAY);
nodeinfo->set("services", Json.Parse("{\"outbound\":[],\"inbound\":[]}", slon_mem_task), JSON_OBJECT);
nodeinfo->set("usage", Json.CreateObject(slon_mem_task), JSON_OBJECT);
nodeinfo->o("usage")->set("users", Json.CreateObject(slon_mem_task), JSON_OBJECT);
nodeinfo->o("usage")->o("users")->set("total", db->o("instance")->o("stats")->@("user_count"), JSON_NUMBER);
// FIXME: return activeMonth, activeHalfyear
nodeinfo->o("usage")->o("users")->set("activeMonth", 0, JSON_NUMBER);
nodeinfo->o("usage")->o("users")->set("activeHalfyear", 0, JSON_NUMBER);
nodeinfo->set("localPosts", db->o("instance")->o("stats")->@("status_count"), JSON_NUMBER);
nodeinfo->set("openRegistrations", db->o("instance")->@("registrations"), JSON_BOOLEAN);
nodeinfo->set("metadata", Json.CreateObject(), JSON_OBJECT);
nodeinfo->set("metadata", Json.CreateObject(slon_mem_task), JSON_OBJECT);
nodeinfo->o("metadata")->set("nodeName", db->o("instance")->@("title"), JSON_STRING);
nodeinfo->o("metadata")->set("nodeDescription", db->o("instance")->@("description"), JSON_STRING);
session->send(nodeinfo);
Json.Delete(nodeinfo);
}

12
Slon/Modules/OAuth.HC
View file

@ -37,7 +37,7 @@ U0 @slon_oauth_fetch_token(U8* client_id)
// POSIX people think JSON should end with a new line, and the Jakt parser disagrees :^)
while (resp->body.data[StrLen(resp->body.data) - 1] == '\n')
resp->body.data[StrLen(resp->body.data) - 1] = NULL;
JsonObject* response = Json.Parse(resp->body.data);
JsonObject* response = Json.Parse(resp->body.data, slon_mem_task);
db->o("oauth")->o("responses")->set(client_id, response, JSON_OBJECT);
}
// FIXME: Free resp
@ -96,7 +96,7 @@ U0 @slon_oauth_verify_access_get(SlonHttpSession* session)
}
I64 created_at = ToF64(CDate2Unix(Now));
JsonObject* token_object = Json.CreateObject();
JsonObject* token_object = Json.CreateObject(slon_mem_task);
token_object->set("access_token", access_token, JSON_STRING);
token_object->set("token_type", "Bearer", JSON_STRING);
token_object->set("scope", "read write follow push", JSON_STRING);
@ -117,7 +117,7 @@ U0 @slon_oauth_verify_access_get(SlonHttpSession* session)
authorization_code_exists = db->o("oauth")->o("codes")->@(authorization_code) > 0;
}
JsonObject* code_object = Json.CreateObject();
JsonObject* code_object = Json.CreateObject(slon_mem_task);
code_object->set("access_token", access_token, JSON_STRING);
code_object->set("token_type", "Bearer", JSON_STRING);
code_object->set("scope", "read write follow push", JSON_STRING);
@ -130,10 +130,9 @@ U0 @slon_oauth_verify_access_get(SlonHttpSession* session)
@slon_db_save_oauth_to_disk;
StrPrint(scratch_buffer, "%s?code=%s", redirect_uri, authorization_code);
JsonObject* redirect_uri_object = Json.CreateObject();
JsonObject* redirect_uri_object = Json.CreateObject(slon_mem_task);
redirect_uri_object->set("redirect_uri", scratch_buffer, JSON_STRING);
session->send(redirect_uri_object);
Json.Delete(redirect_uri_object);
@slon_free(session, authorization_code);
@slon_free(session, access_token);
@ -155,7 +154,6 @@ U0 @slon_oauth_verify_access_get(SlonHttpSession* session)
}
session->status(202);
}
Json.Delete(app_object);
}
U0 @slon_oauth_token_post(SlonHttpSession* session)
@ -187,6 +185,4 @@ U0 @slon_oauth_token_post(SlonHttpSession* session)
// If client_id and client_secret do not match, it's Unauthorized
session->status(401);
}
Json.Delete(code_object);
}

2
Slon/Modules/Web.HC
View file

@ -15,7 +15,7 @@ U0 @slon_web_user_get(SlonHttpSession* session)
I64 html_file_size;
U8* html_file_data = FileRead("M:/Slon/Static/html/user.html", &html_file_size);
U8* user_file_data = Json.Stringify(actor);
U8* user_file_data = Json.Stringify(actor, slon_mem_task);
U8* html_data = @slon_calloc(session, (html_file_size * 2) + (StrLen(user_file_data) * 2));
String.Append(html_data, html_file_data);

15
Slon/Modules/Webfinger.HC
View file

@ -7,29 +7,28 @@ U0 @slon_webfinger(SlonHttpSession* session)
resource = StrFind(":", resource) + 1;
StrFind("@", resource)[0] = NULL;
if (db->o("actors")->@(resource)) {
JsonObject* webfinger_object = Json.CreateObject();
JsonObject* webfinger_object = Json.CreateObject(slon_mem_task);
StrPrint(scratch_buffer, "acct:%s@%s", resource, db->o("instance")->@("uri"));
webfinger_object->set("subject", scratch_buffer, JSON_STRING);
JsonArray* aliases = Json.CreateArray();
JsonArray* aliases = Json.CreateArray(slon_mem_task);
StrPrint(scratch_buffer, "https://%s/@%s", db->o("instance")->@("uri"), resource);
aliases->append(Json.CreateItem(scratch_buffer, JSON_STRING));
aliases->append(scratch_buffer, JSON_STRING);
StrPrint(scratch_buffer, "https://%s/users/%s", db->o("instance")->@("uri"), resource);
aliases->append(Json.CreateItem(scratch_buffer, JSON_STRING));
aliases->append(scratch_buffer, JSON_STRING);
webfinger_object->set("aliases", aliases, JSON_ARRAY);
JsonArray* links = Json.CreateArray();
JsonObject* link_object = Json.CreateObject();
JsonArray* links = Json.CreateArray(slon_mem_task);
JsonObject* link_object = Json.CreateObject(slon_mem_task);
link_object->set("rel", "self", JSON_STRING);
link_object->set("type", "application/activity+json", JSON_STRING);
StrPrint(scratch_buffer, "https://%s/users/%s", db->o("instance")->@("uri"), resource);
link_object->set("href", scratch_buffer, JSON_STRING);
links->append(Json.CreateItem(link_object, JSON_OBJECT));
links->append(link_object);
webfinger_object->set("links", links, JSON_ARRAY);
session->send(webfinger_object);
Json.Delete(webfinger_object);
} else {
session->status(404);
}