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

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