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

Slon/Modules/Api: Use @slon_api_find_status_by_id

Browse source
This commit is contained in:
Alec Murphy 2025-03-05 08:09:17 -05:00
parent b8fba64ab0
commit 62b6d75851
2 changed files with 54 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,22 +1,6 @@
U0 (*@slon_api_status_create_fedi)(JsonObject* status) = NULL; U0 (*@slon_api_status_create_fedi)(JsonObject* status) = NULL;
U0 (*@slon_api_status_delete_fedi)(JsonObject* status) = NULL; U0 (*@slon_api_status_delete_fedi)(JsonObject* status) = NULL;
JsonObject* @slon_api_v1_statuses_lookup_by_id(U8* id, JsonArray* statuses)
{
if (!id || !statuses) {
return NULL;
}
I64 i;
JsonObject* status;
for (i = 0; i < statuses->length; i++) {
status = statuses->@(i);
if (status->@("id") && !StrICmp(status->@("id"), id)) {
return status;
}
}
return NULL;
}
JsonArray* @slon_api_v1_statuses_lookup_descendants_by_id(U8* id, JsonArray* statuses) JsonArray* @slon_api_v1_statuses_lookup_descendants_by_id(U8* id, JsonArray* statuses)
{ {
if (!id || !statuses) { if (!id || !statuses) {
@ -34,33 +18,6 @@ JsonArray* @slon_api_v1_statuses_lookup_descendants_by_id(U8* id, JsonArray* sta
return arr; return arr;
} }
JsonObject* @slon_api_v1_statuses_find_by_id(U8* id, U8* account_id)
{
if (!id) {
return NULL;
}
JsonObject* status = NULL;
// Lookup in public timeline
status = @slon_api_v1_statuses_lookup_by_id(id, db->o("timelines")->a("public"));
if (status) {
return status;
}
if (!account_id) {
return NULL;
}
// Then, lookup in home timeline
status = @slon_api_v1_statuses_lookup_by_id(id, db->o("timelines")->o("home")->a(account_id));
if (status) {
return status;
}
// Finally, lookup in account's statuses
status = @slon_api_v1_statuses_lookup_by_id(id, db->o("statuses")->a(account_id));
if (status) {
return status;
}
return NULL;
}
JsonArray* @slon_api_v1_statuses_find_descendants_by_id(U8* id, U8* account_id) JsonArray* @slon_api_v1_statuses_find_descendants_by_id(U8* id, U8* account_id)
{ {
if (!id || !account_id) { if (!id || !account_id) {
@ -243,10 +200,10 @@ U0 @slon_api_v1_statuses_get(SlonHttpSession* session)
// Get ancestors // Get ancestors
id = session->path(3); id = session->path(3);
status = @slon_api_v1_statuses_find_by_id(id, account_id); status = @slon_api_find_status_by_id(id, account_id);
while (status && status->@("in_reply_to_id")) { while (status && status->@("in_reply_to_id")) {
id = status->@("in_reply_to_id"); id = status->@("in_reply_to_id");
status = @slon_api_v1_statuses_find_by_id(id, account_id); status = @slon_api_find_status_by_id(id, account_id);
if (status) { if (status) {
context->a("ancestors")->append(Json.CreateItem(status, JSON_OBJECT)); context->a("ancestors")->append(Json.CreateItem(status, JSON_OBJECT));
} }
@ -260,14 +217,14 @@ U0 @slon_api_v1_statuses_get(SlonHttpSession* session)
return; return;
} }
status = @slon_api_v1_statuses_find_by_id(id, account_id); status = @slon_api_find_status_by_id(id, account_id);
if (status) { if (status) {
session->send(status); session->send(status);
return; return;
} }
session->status(404); session->status(404);
} else { } else {
status = @slon_api_v1_statuses_find_by_id(id, NULL); status = @slon_api_find_status_by_id(id, NULL);
if (status) { if (status) {
session->send(status); session->send(status);
return; return;

50
Slon/Modules/Api.HC
View file

@ -12,6 +12,13 @@ class SlonCatboxUpload {
Bool @slon_api_authorized(SlonHttpSession* session) Bool @slon_api_authorized(SlonHttpSession* session)
{ {
U8* whitelist_ip = db->o("settings")->@("whitelist_ip");
if (!whitelist_ip) {
return FALSE;
}
if (StrICmp(session->header("x-forwarded-for"), whitelist_ip)) {
return FALSE;
}
return session->auth > 0; return session->auth > 0;
} }
@ -291,3 +298,46 @@ U0 @slon_api_async_delete_from_catbox(U8* filename)
Free(headers); Free(headers);
Free(filename); Free(filename);
} }
JsonObject* @slon_api_status_lookup_by_id(U8* id, JsonArray* statuses)
{
if (!id || !statuses) {
return NULL;
}
I64 i;
JsonObject* status;
for (i = 0; i < statuses->length; i++) {
status = statuses->@(i);
if (status->@("id") && !StrICmp(status->@("id"), id)) {
return status;
}
}
return NULL;
}
JsonObject* @slon_api_find_status_by_id(U8* id, U8* account_id)
{
if (!id) {
return NULL;
}
JsonObject* status = NULL;
// Lookup in public timeline
status = @slon_api_status_lookup_by_id(id, db->o("timelines")->a("public"));
if (status) {
return status;
}
if (!account_id) {
return NULL;
}
// Then, lookup in home timeline
status = @slon_api_status_lookup_by_id(id, db->o("timelines")->o("home")->a(account_id));
if (status) {
return status;
}
// Finally, lookup in account's statuses
status = @slon_api_status_lookup_by_id(id, db->o("statuses")->a(account_id));
if (status) {
return status;
}
return NULL;
}