monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-12-25 00:43:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'Mastodon API private timeline fixes' (#44) from poesty/snac2:master into master

Browse source 
Reviewed-on: https://codeberg.org/grunfink/snac2/pulls/44
This commit is contained in:
grunfink 2023-06-11 07:05:07 +00:00
commit 422b3148ae
1 changed files with 121 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

229
mastoapi.c
View file

@ -1172,7 +1172,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
/* only return entries older that max_id */ /* only return entries older that max_id */
if (max_id) { if (max_id) {
if (strcmp(v, max_id) == 0) if (strcmp(v, MID_TO_MD5(max_id)) == 0)
max_id = NULL; max_id = NULL;
continue; continue;
@ -1180,14 +1180,14 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
/* only returns entries newer than since_id */ /* only returns entries newer than since_id */
if (since_id) { if (since_id) {
if (strcmp(v, since_id) == 0) if (strcmp(v, MID_TO_MD5(since_id)) == 0)
break; break;
} }
/* only returns entries newer than min_id */ /* only returns entries newer than min_id */
/* what does really "Return results immediately newer than ID" mean? */ /* what does really "Return results immediately newer than ID" mean? */
if (min_id) { if (min_id) {
if (strcmp(v, min_id) == 0) if (strcmp(v, MID_TO_MD5(min_id)) == 0)
break; break;
} }
@ -1200,6 +1200,11 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
if (strcmp(type, "Note") != 0 && strcmp(type, "Question") != 0) if (strcmp(type, "Note") != 0 && strcmp(type, "Question") != 0)
continue; continue;
/* discard notes from people we don't follow with no boosts */
if (!following_check(&snac1, xs_dict_get(msg, "attributedTo")) &&
object_announces_len(xs_dict_get(msg, "id")) == 0)
continue;
/* discard notes from muted morons */ /* discard notes from muted morons */
if (is_muted(&snac1, xs_dict_get(msg, "attributedTo"))) if (is_muted(&snac1, xs_dict_get(msg, "attributedTo")))
continue; continue;
@ -1505,102 +1510,106 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
else else
if (xs_startswith(cmd, "/v1/statuses/")) { /** **/ if (xs_startswith(cmd, "/v1/statuses/")) { /** **/
/* information about a status */ /* information about a status */
xs *l = xs_split(cmd, "/"); if (logged_in) {
const char *id = xs_list_get(l, 3); xs *l = xs_split(cmd, "/");
const char *op = xs_list_get(l, 4); const char *id = xs_list_get(l, 3);
const char *op = xs_list_get(l, 4);
if (!xs_is_null(id)) { if (!xs_is_null(id)) {
xs *msg = NULL; xs *msg = NULL;
xs *out = NULL; xs *out = NULL;
/* skip the 'fake' part of the id */ /* skip the 'fake' part of the id */
id = MID_TO_MD5(id); id = MID_TO_MD5(id);
if (valid_status(object_get_by_md5(id, &msg))) { if (valid_status(object_get_by_md5(id, &msg))) {
if (op == NULL) { if (op == NULL) {
if (!is_muted(&snac1, xs_dict_get(msg, "attributedTo"))) { if (!is_muted(&snac1, xs_dict_get(msg, "attributedTo"))) {
/* return the status itself */ /* return the status itself */
out = mastoapi_status(&snac1, msg); out = mastoapi_status(&snac1, msg);
}
}
else
if (strcmp(op, "context") == 0) { /** **/
/* return ancestors and children */
xs *anc = xs_list_new();
xs *des = xs_list_new();
xs_list *p;
xs_str *v;
char pid[64];
/* build the [grand]parent list, moving up */
strncpy(pid, id, sizeof(pid));
while (object_parent(pid, pid, sizeof(pid))) {
xs *m2 = NULL;
if (valid_status(timeline_get_by_md5(&snac1, pid, &m2))) {
xs *st = mastoapi_status(&snac1, m2);
anc = xs_list_insert(anc, 0, st);
} }
else
break;
} }
else
if (strcmp(op, "context") == 0) { /** **/
/* return ancestors and children */
xs *anc = xs_list_new();
xs *des = xs_list_new();
xs_list *p;
xs_str *v;
char pid[64];
/* build the children list */ /* build the [grand]parent list, moving up */
xs *children = object_children(xs_dict_get(msg, "id")); strncpy(pid, id, sizeof(pid));
p = children;
while (xs_list_iter(&p, &v)) { while (object_parent(pid, pid, sizeof(pid))) {
xs *m2 = NULL; xs *m2 = NULL;
if (valid_status(timeline_get_by_md5(&snac1, v, &m2))) { if (valid_status(timeline_get_by_md5(&snac1, pid, &m2))) {
if (xs_is_null(xs_dict_get(m2, "name"))) {
xs *st = mastoapi_status(&snac1, m2); xs *st = mastoapi_status(&snac1, m2);
des = xs_list_append(des, st); anc = xs_list_insert(anc, 0, st);
}
else
break;
}
/* build the children list */
xs *children = object_children(xs_dict_get(msg, "id"));
p = children;
while (xs_list_iter(&p, &v)) {
xs *m2 = NULL;
if (valid_status(timeline_get_by_md5(&snac1, v, &m2))) {
if (xs_is_null(xs_dict_get(m2, "name"))) {
xs *st = mastoapi_status(&snac1, m2);
des = xs_list_append(des, st);
}
}
}
out = xs_dict_new();
out = xs_dict_append(out, "ancestors", anc);
out = xs_dict_append(out, "descendants", des);
}
else
if (strcmp(op, "reblogged_by") == 0 || /** **/
strcmp(op, "favourited_by") == 0) { /** **/
/* return the list of people who liked or boosted this */
out = xs_list_new();
xs *l = NULL;
if (op[0] == 'r')
l = object_announces(xs_dict_get(msg, "id"));
else
l = object_likes(xs_dict_get(msg, "id"));
xs_list *p = l;
xs_str *v;
while (xs_list_iter(&p, &v)) {
xs *actor2 = NULL;
if (valid_status(object_get_by_md5(v, &actor2))) {
xs *acct2 = mastoapi_account(actor2);
out = xs_list_append(out, acct2);
} }
} }
} }
out = xs_dict_new();
out = xs_dict_append(out, "ancestors", anc);
out = xs_dict_append(out, "descendants", des);
} }
else else
if (strcmp(op, "reblogged_by") == 0 || /** **/ srv_debug(1, xs_fmt("mastoapi status: bad id %s", id));
strcmp(op, "favourited_by") == 0) { /** **/
/* return the list of people who liked or boosted this */
out = xs_list_new();
xs *l = NULL; if (out != NULL) {
*body = xs_json_dumps_pp(out, 4);
if (op[0] == 'r') *ctype = "application/json";
l = object_announces(xs_dict_get(msg, "id")); status = 200;
else
l = object_likes(xs_dict_get(msg, "id"));
xs_list *p = l;
xs_str *v;
while (xs_list_iter(&p, &v)) {
xs *actor2 = NULL;
if (valid_status(object_get_by_md5(v, &actor2))) {
xs *acct2 = mastoapi_account(actor2);
out = xs_list_append(out, acct2);
}
}
} }
} }
else
srv_debug(1, xs_fmt("mastoapi status: bad id %s", id));
if (out != NULL) {
*body = xs_json_dumps_pp(out, 4);
*ctype = "application/json";
status = 200;
}
} }
else
status = 401;
} }
else else
if (strcmp(cmd, "/v1/preferences") == 0) { /** **/ if (strcmp(cmd, "/v1/preferences") == 0) { /** **/
@ -1622,43 +1631,47 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
} }
else else
if (strcmp(cmd, "/v2/search") == 0) { /** **/ if (strcmp(cmd, "/v2/search") == 0) { /** **/
const char *q = xs_dict_get(args, "q"); if (logged_in) {
const char *type = xs_dict_get(args, "type"); const char *q = xs_dict_get(args, "q");
const char *offset = xs_dict_get(args, "offset"); const char *type = xs_dict_get(args, "type");
const char *offset = xs_dict_get(args, "offset");
xs *acl = xs_list_new(); xs *acl = xs_list_new();
xs *stl = xs_list_new(); xs *stl = xs_list_new();
xs *htl = xs_list_new(); xs *htl = xs_list_new();
xs *res = xs_dict_new(); xs *res = xs_dict_new();
if (xs_is_null(offset) || strcmp(offset, "0") == 0) { if (xs_is_null(offset) || strcmp(offset, "0") == 0) {
/* reply something only for offset 0; otherwise, /* reply something only for offset 0; otherwise,
apps like Tusky keep asking again and again */ apps like Tusky keep asking again and again */
if (!xs_is_null(q) && !xs_is_null(type) && strcmp(type, "accounts") == 0) { if (!xs_is_null(q) && !xs_is_null(type) && strcmp(type, "accounts") == 0) {
/* do a webfinger query */ /* do a webfinger query */
char *actor = NULL; char *actor = NULL;
char *user = NULL; char *user = NULL;
if (valid_status(webfinger_request(q, &actor, &user))) { if (valid_status(webfinger_request(q, &actor, &user))) {
xs *actor_o = NULL; xs *actor_o = NULL;
if (valid_status(actor_request(&snac1, actor, &actor_o))) { if (valid_status(actor_request(&snac1, actor, &actor_o))) {
xs *acct = mastoapi_account(actor_o); xs *acct = mastoapi_account(actor_o);
acl = xs_list_append(acl, acct); acl = xs_list_append(acl, acct);
}
} }
} }
} }
res = xs_dict_append(res, "accounts", acl);
res = xs_dict_append(res, "statuses", stl);
res = xs_dict_append(res, "hashtags", htl);
*body = xs_json_dumps_pp(res, 4);
*ctype = "application/json";
status = 200;
} }
else
res = xs_dict_append(res, "accounts", acl); status = 401;
res = xs_dict_append(res, "statuses", stl);
res = xs_dict_append(res, "hashtags", htl);
*body = xs_json_dumps_pp(res, 4);
*ctype = "application/json";
status = 200;
} }
/* user cleanup */ /* user cleanup */