parent
475e648feb
commit
401035a0d1
5 changed files with 161 additions and 9 deletions
|
@ -3,9 +3,35 @@ U0 @slon_api_v1_favourites_get(SlonHttpSession* session)
|
||||||
// SLON_SCRATCH_BUFFER_AND_REQUEST_JSON
|
// SLON_SCRATCH_BUFFER_AND_REQUEST_JSON
|
||||||
|
|
||||||
if (@slon_api_authorized(session)) {
|
if (@slon_api_authorized(session)) {
|
||||||
// SLON_AUTH_ACCOUNT_ID
|
SLON_AUTH_ACCOUNT_ID
|
||||||
// FIXME: Implement this
|
|
||||||
session->send(SLON_EMPTY_JSON_ARRAY);
|
JsonArray* favourites_array = db->o("favourites")->a(account_id);
|
||||||
|
JsonArray* favourites = NULL;
|
||||||
|
JsonObject* status = NULL;
|
||||||
|
U8* status_acct_id = NULL;
|
||||||
|
U8* status_id = NULL;
|
||||||
|
|
||||||
|
I64 i;
|
||||||
|
if (favourites_array) {
|
||||||
|
favourites = Json.CreateArray(session->mem_task);
|
||||||
|
for (i = 0; i < favourites_array->length; i++) {
|
||||||
|
status_acct_id = favourites_array->o(i)->@("account_id");
|
||||||
|
status_id = favourites_array->o(i)->@("status_id");
|
||||||
|
if (status_id && status_acct_id) {
|
||||||
|
status = @slon_api_find_status_by_id(status_id, status_acct_id);
|
||||||
|
if (status) {
|
||||||
|
status = Json.Clone(status, session->mem_task);
|
||||||
|
// FIXME: We should have a unified way to apply these for an auth user during a query:
|
||||||
|
// favourited, reblogged, muted, bookmarked, pinned, filtered
|
||||||
|
status->set("favourited", TRUE, JSON_BOOLEAN);
|
||||||
|
favourites->append(status);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
session->send(favourites);
|
||||||
|
} else {
|
||||||
|
session->send(SLON_EMPTY_JSON_ARRAY);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
session->status(401);
|
session->status(401);
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,8 +60,9 @@ U0 @slon_api_v1_statuses_query(SlonHttpSession* session, JsonArray* status_array
|
||||||
JsonObject* status = NULL;
|
JsonObject* status = NULL;
|
||||||
if (status_array && status_array->length) {
|
if (status_array && status_array->length) {
|
||||||
for (i = status_array->length - 1; i > -1; i--) {
|
for (i = status_array->length - 1; i > -1; i--) {
|
||||||
status = status_array->o(i);
|
status = Json.Clone(status_array->o(i), session->mem_task);
|
||||||
status_id = Str2I64(status->@("id"));
|
status_id = Str2I64(status->@("id"));
|
||||||
|
status->set("favourited", @slon_api_status_is_favourited(session, status, account_id), JSON_BOOLEAN);
|
||||||
exclude_status = FALSE;
|
exclude_status = FALSE;
|
||||||
if (status->@("deleted")) {
|
if (status->@("deleted")) {
|
||||||
exclude_status = TRUE;
|
exclude_status = TRUE;
|
||||||
|
@ -171,6 +172,7 @@ U0 @slon_api_v1_statuses_get(SlonHttpSession* session)
|
||||||
JsonObject* status = NULL;
|
JsonObject* status = NULL;
|
||||||
|
|
||||||
if (@slon_api_authorized(session)) {
|
if (@slon_api_authorized(session)) {
|
||||||
|
SLON_AUTH_ACCOUNT_ID
|
||||||
|
|
||||||
if (session->path_count() > 4 && !StrICmp("context", session->path(4))) {
|
if (session->path_count() > 4 && !StrICmp("context", session->path(4))) {
|
||||||
JsonObject* context = Json.CreateObject(slon_mem_task);
|
JsonObject* context = Json.CreateObject(slon_mem_task);
|
||||||
|
@ -196,6 +198,8 @@ U0 @slon_api_v1_statuses_get(SlonHttpSession* session)
|
||||||
|
|
||||||
status = @slon_api_find_status_by_id(id, NULL);
|
status = @slon_api_find_status_by_id(id, NULL);
|
||||||
if (status) {
|
if (status) {
|
||||||
|
status = Json.Clone(status, session->mem_task);
|
||||||
|
status->set("favourited", @slon_api_status_is_favourited(session, status, account_id), JSON_BOOLEAN);
|
||||||
session->send(status);
|
session->send(status);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -218,11 +222,35 @@ U0 @slon_api_v1_statuses_post(SlonHttpSession* session)
|
||||||
SLON_AUTH_ACCOUNT_ID
|
SLON_AUTH_ACCOUNT_ID
|
||||||
|
|
||||||
U8* id = NULL;
|
U8* id = NULL;
|
||||||
|
JsonObject* status = NULL;
|
||||||
|
|
||||||
if (session->path_count() > 4) {
|
if (session->path_count() > 4) {
|
||||||
// FIXME: Do stuff
|
id = session->path(3);
|
||||||
AdamLog("session->path_count is : %d\n", session->path_count());
|
U8* verb = session->path(4);
|
||||||
session->status(404);
|
|
||||||
|
status = @slon_api_find_status_by_id(id, NULL);
|
||||||
|
if (!status) {
|
||||||
|
session->status(404);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!StrICmp("favourite", verb)) {
|
||||||
|
status = Json.Clone(status, session->mem_task);
|
||||||
|
@slon_api_favourite_status(session, status, account_id);
|
||||||
|
status->set("favourited", TRUE, JSON_BOOLEAN);
|
||||||
|
session->send(status);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!StrICmp("unfavourite", verb)) {
|
||||||
|
status = Json.Clone(status, session->mem_task);
|
||||||
|
@slon_api_unfavourite_status(session, status, account_id);
|
||||||
|
status->set("favourited", FALSE, JSON_BOOLEAN);
|
||||||
|
session->send(status);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
session->status(400);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -270,7 +298,7 @@ U0 @slon_api_v1_statuses_post(SlonHttpSession* session)
|
||||||
// Mastodon iOS app lets us post with +: reblogs_count, favourites_count, emojis, tags, mentions
|
// 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
|
// IceCubesApp lets us post with +: media_attachments, replies_count, spoiler_text, sensitive
|
||||||
|
|
||||||
JsonObject* status = Json.CreateObject(slon_mem_task);
|
status = Json.CreateObject(slon_mem_task);
|
||||||
JsonObject* reply_to_status = NULL;
|
JsonObject* reply_to_status = NULL;
|
||||||
JsonArray* media_attachments = NULL;
|
JsonArray* media_attachments = NULL;
|
||||||
String.Trim(request_json->@("status"));
|
String.Trim(request_json->@("status"));
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if (!StrICmp("/api/v1/statuses", session->path())) {
|
if (String.BeginsWith("/api/v1/statuses", session->path())) {
|
||||||
@slon_api_v1_statuses_post(session);
|
@slon_api_v1_statuses_post(session);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,6 +147,70 @@ JsonObject* @slon_api_announcement_by_id(U8* id)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Bool @slon_api_status_is_favourited(SlonHttpSession* session, JsonObject* status, U8* account_id)
|
||||||
|
{
|
||||||
|
no_warn session;
|
||||||
|
JsonArray* favourites = db->o("favourites")->a(account_id);
|
||||||
|
JsonObject* favourite = NULL;
|
||||||
|
if (!favourites) {
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
I64 i;
|
||||||
|
for (i = 0; i < favourites->length; i++) {
|
||||||
|
favourite = favourites->o(i);
|
||||||
|
if (!StrICmp(favourite->@("status_id"), status->@("id")) && !StrICmp(favourite->@("account_id"), status->o("account")->@("id"))) {
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
U0 @slon_api_favourite_status(SlonHttpSession* session, JsonObject* status, U8* account_id)
|
||||||
|
{
|
||||||
|
Bool is_already_favourited = FALSE;
|
||||||
|
JsonArray* favourites = db->o("favourites")->a(account_id);
|
||||||
|
JsonObject* favourite = NULL;
|
||||||
|
if (!favourites) {
|
||||||
|
favourites = Json.CreateArray(slon_db_mem_task);
|
||||||
|
db->o("favourites")->set(account_id, favourites, JSON_ARRAY);
|
||||||
|
}
|
||||||
|
I64 i;
|
||||||
|
for (i = 0; i < favourites->length; i++) {
|
||||||
|
favourite = favourites->o(i);
|
||||||
|
if (!StrICmp(favourite->@("status_id"), status->@("id")) && !StrICmp(favourite->@("account_id"), status->o("account")->@("id"))) {
|
||||||
|
is_already_favourited = TRUE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!is_already_favourited) {
|
||||||
|
favourite = Json.CreateObject(session->mem_task);
|
||||||
|
favourite->set("status_id", status->@("id"), JSON_STRING);
|
||||||
|
favourite->set("account_id", status->o("account")->@("id"), JSON_STRING);
|
||||||
|
favourites->append(favourite);
|
||||||
|
@slon_db_save_favourites_to_disk;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
U0 @slon_api_unfavourite_status(SlonHttpSession* session, JsonObject* status, U8* account_id)
|
||||||
|
{
|
||||||
|
no_warn session;
|
||||||
|
JsonArray* favourites = db->o("favourites")->a(account_id);
|
||||||
|
JsonObject* favourite = NULL;
|
||||||
|
if (!favourites) {
|
||||||
|
favourites = Json.CreateArray(slon_db_mem_task);
|
||||||
|
db->o("favourites")->set(account_id, favourites, JSON_ARRAY);
|
||||||
|
}
|
||||||
|
I64 i;
|
||||||
|
for (i = 0; i < favourites->length; i++) {
|
||||||
|
favourite = favourites->o(i);
|
||||||
|
if (!StrICmp(favourite->@("status_id"), status->@("id")) && !StrICmp(favourite->@("account_id"), status->o("account")->@("id"))) {
|
||||||
|
favourites->remove(i);
|
||||||
|
@slon_db_save_favourites_to_disk;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
U0 @slon_api_async_upload_to_catbox(SlonCatboxUpload* cb)
|
U0 @slon_api_async_upload_to_catbox(SlonCatboxUpload* cb)
|
||||||
{
|
{
|
||||||
if (!cb) {
|
if (!cb) {
|
||||||
|
|
|
@ -79,6 +79,26 @@ U0 @slon_db_load_private_keys_from_disk()
|
||||||
db->set("private_keys", Json.ParseFile(scratch_buffer, slon_db_mem_task), JSON_OBJECT);
|
db->set("private_keys", Json.ParseFile(scratch_buffer, slon_db_mem_task), JSON_OBJECT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
U0 @slon_db_load_favourites_from_disk()
|
||||||
|
{
|
||||||
|
JsonObject* favourites = Json.CreateObject(slon_db_mem_task);
|
||||||
|
U8 scratch_buffer[256];
|
||||||
|
StrPrint(scratch_buffer, "%s/favourites/*.json", SLON_DB_PATH);
|
||||||
|
CDirEntry* files = FilesFind(scratch_buffer);
|
||||||
|
CDirEntry* de = files;
|
||||||
|
JsonArray* favourite_array = NULL;
|
||||||
|
while (de) {
|
||||||
|
favourite_array = Json.ParseFile(de->full_name, slon_db_mem_task);
|
||||||
|
if (favourite_array) {
|
||||||
|
StrFind(".json", de->name)[0] = NULL;
|
||||||
|
favourites->set(de->name, favourite_array, JSON_ARRAY);
|
||||||
|
}
|
||||||
|
de = de->next;
|
||||||
|
}
|
||||||
|
DirTreeDel(files);
|
||||||
|
db->set("favourites", favourites, JSON_OBJECT);
|
||||||
|
}
|
||||||
|
|
||||||
U0 @slon_db_load_followers_from_disk()
|
U0 @slon_db_load_followers_from_disk()
|
||||||
{
|
{
|
||||||
JsonObject* followers = Json.CreateObject(slon_db_mem_task);
|
JsonObject* followers = Json.CreateObject(slon_db_mem_task);
|
||||||
|
@ -265,6 +285,17 @@ U0 @slon_db_save_private_keys_to_disk()
|
||||||
Json.DumpToFile(scratch_buffer, db->o("private_keys"), slon_db_mem_task);
|
Json.DumpToFile(scratch_buffer, db->o("private_keys"), slon_db_mem_task);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
U0 @slon_db_save_favourites_to_disk()
|
||||||
|
{
|
||||||
|
U8 scratch_buffer[256];
|
||||||
|
JsonKey* key = db->o("favourites")->keys;
|
||||||
|
while (key) {
|
||||||
|
StrPrint(scratch_buffer, "%s/favourites/%s.json", SLON_DB_PATH, key->name);
|
||||||
|
Json.DumpToFile(scratch_buffer, key->value, slon_db_mem_task);
|
||||||
|
key = key->next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
U0 @slon_db_save_followers_to_disk()
|
U0 @slon_db_save_followers_to_disk()
|
||||||
{
|
{
|
||||||
U8 scratch_buffer[256];
|
U8 scratch_buffer[256];
|
||||||
|
@ -344,6 +375,7 @@ U0 @slon_db_save_to_disk()
|
||||||
@slon_db_save_actors_to_disk();
|
@slon_db_save_actors_to_disk();
|
||||||
@slon_db_save_announcements_to_disk();
|
@slon_db_save_announcements_to_disk();
|
||||||
@slon_db_save_apps_to_disk();
|
@slon_db_save_apps_to_disk();
|
||||||
|
@slon_db_save_favourites_to_disk();
|
||||||
@slon_db_save_followers_to_disk();
|
@slon_db_save_followers_to_disk();
|
||||||
@slon_db_save_following_to_disk();
|
@slon_db_save_following_to_disk();
|
||||||
@slon_db_save_instance_to_disk();
|
@slon_db_save_instance_to_disk();
|
||||||
|
@ -365,6 +397,7 @@ U0 @slon_db_load_from_defaults()
|
||||||
db->set("private_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("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("public_keys", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
|
||||||
|
db->set("favourites", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
|
||||||
db->set("followers", 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("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("instance", Json.ParseFile("M:/Slon/Static/defaults/instance.json", slon_db_mem_task), JSON_OBJECT);
|
||||||
|
@ -394,6 +427,7 @@ U0 @slon_db_load_from_disk()
|
||||||
@slon_db_load_private_keys_from_disk();
|
@slon_db_load_private_keys_from_disk();
|
||||||
db->set("private_keys_binary", 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("public_keys", Json.CreateObject(slon_db_mem_task), JSON_OBJECT);
|
||||||
|
@slon_db_load_favourites_from_disk();
|
||||||
@slon_db_load_followers_from_disk();
|
@slon_db_load_followers_from_disk();
|
||||||
@slon_db_load_following_from_disk();
|
@slon_db_load_following_from_disk();
|
||||||
@slon_db_load_instance_from_disk();
|
@slon_db_load_instance_from_disk();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue