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

Everywhere: Use Catbox API asynchronously

Browse source 
Fixes #2
This commit is contained in:
Alec Murphy 2025-03-04 13:26:35 -05:00
parent 04dce33aca
commit a7649a00c8
6 changed files with 102 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Slon/Api/V1/Media.HC
View file

@ -1,3 +1,26 @@
U0 @slon_api_v1_media_get(SlonHttpSession* session)
{
if (@slon_api_authorized(session)) {
if (session->path_count() < 4) {
session->status(400);
return;
}
U8* id = session->path(3);
if (db->o("media")->o(id)) {
if (db->o("media")->o(id)->@("url", TRUE)(JsonKey*)->type == JSON_NULL) {
session->send(db->o("media")->o(id));
session->status(206);
} else {
session->send(db->o("media")->o(id));
}
} else {
session->status(404);
}
} else {
session->status(401);
}
}
U0 @slon_api_v1_media_put(SlonHttpSession* session)
{
SLON_SCRATCH_BUFFER_AND_REQUEST_JSON

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

@ -196,7 +196,7 @@ U0 @slon_api_v1_statuses_delete(SlonHttpSession* session)
while (*(attachment_url_ptr - 1) != '/') {
--attachment_url_ptr;
}
@slon_api_delete_from_catbox(session, attachment_url_ptr);
Spawn(&@slon_api_async_delete_from_catbox, StrNew(attachment_url_ptr, adam_task), "SlonAsyncCatboxDelete");
}
}
}

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

@ -6,66 +6,25 @@ U0 @slon_api_v2_media_post(SlonHttpSession* session)
no_warn request_json;
if (@slon_api_authorized(session)) {
U8* data = session->request->data;
// Advance to Content-Disposition for file attachment
data = StrFind("filename=", data);
if (!data) {
if (!request_json->@("file")) {
session->status(400);
return;
}
if (!StrFind("\r\n\r\n", data)) {
SlonMultipartFile* file = request_json->@("file");
if (!file->buffer || !file->size || !file->content_type) {
session->status(400);
return;
}
// Mark beginning of file data
U8* file_ptr = StrFind("\r\n\r\n", data) + 4;
// NULL terminate Content-Type
StrFind("\r\n\r\n", data)[0] = NULL;
U8* mime_type = StrFind("Content-Type: ", data);
if (!mime_type) {
session->status(400);
return;
}
mime_type += 14; // StrLen("Content-Type: ")
if (!String.BeginsWith("image/", mime_type)) {
session->status(400);
return;
}
U8* boundary = StrFind("boundary=", session->header("content-type")) + 9;
I64 content_length = Str2I64(session->header("content-length"));
// Strip begin double-quotes and ending CRLF, double-quotes
while (boundary[0] == '"')
boundary++;
// Rstrip EOL
while (boundary[StrLen(boundary) - 1] == '\"' || boundary[StrLen(boundary) - 1] == ' ' || boundary[StrLen(boundary) - 1] == '\r' || boundary[StrLen(boundary) - 1] == '\n')
boundary[StrLen(boundary) - 1] = NULL;
// Get file size
StrPrint(scratch_buffer, "\r\n--%s", boundary);
I64 file_size = 0;
I64 scratch_buffer_len = StrLen(scratch_buffer);
while (file_size < content_length && MemCmp(file_ptr + file_size, scratch_buffer, scratch_buffer_len)) {
++file_size;
}
// File size is non-zero and within bounds
if (!file_size || file_size >= content_length) {
session->status(400);
return;
}
U8* media_id = @slon_api_generate_unique_id(session);
U8* media_file_ext = StrFind("/", file->content_type) + 1;
I32 width = 0;
I32 height = 0;
I32 comp = 0;
I32 code = @stbi_info_from_memory(file_ptr, file_size, &width, &height, &comp);
I32 code = @stbi_info_from_memory(file->buffer, file->size, &width, &height, &comp);
// Buffer contains a valid image file
if (code != 1) {
@ -73,37 +32,33 @@ U0 @slon_api_v2_media_post(SlonHttpSession* session)
return;
}
U8* media_id = @slon_api_generate_unique_id(session);
U8* media_file_ext = StrFind("/", mime_type) + 1;
// Write image file to RAM disk
StrPrint(scratch_buffer, "%s/%s.%s", SLON_MEDIA_PATH, media_id, media_file_ext);
FileWrite(scratch_buffer, file_ptr, file_size);
FileWrite(scratch_buffer, file->buffer, file->size);
// Then, upload to Catbox
U8* media_url = @slon_api_upload_to_catbox(session, scratch_buffer);
if (media_url) {
JsonObject* media_object = Json.CreateObject();
media_object->set("id", media_id, JSON_STRING);
media_object->set("type", "image", JSON_STRING);
media_object->set("url", media_url, JSON_STRING);
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->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);
media_object->set("blurhash", NULL, JSON_NULL);
db->o("media")->set(media_id, media_object, JSON_OBJECT);
session->send(media_object);
@slon_free(session, media_url);
} else {
session->status(400);
}
// Create media object
JsonObject* media_object = Json.CreateObject();
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->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);
media_object->set("blurhash", NULL, JSON_NULL);
db->o("media")->set(media_id, media_object, JSON_OBJECT);
// Delete image from RAM disk
Del(scratch_buffer);
// Then, async upload the image file to Catbox
SlonCatboxUpload* cb = CAlloc(sizeof(SlonCatboxUpload), adam_task);
cb->key = media_object->@("url", TRUE);
cb->filepath = StrNew(scratch_buffer, adam_task);
Spawn(&@slon_api_async_upload_to_catbox, cb, "SlonAsyncCatboxUpload");
session->send(media_object);
session->status(202);
@slon_free(session, media_id);
} else {