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

More mastoapi_timeline() tweaks.

Browse source
This commit is contained in:
default 2024-08-09 17:17:27 +02:00
parent 339dc1a325
commit 61d8b46782
1 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
mastoapi.c
View file

@ -1261,7 +1261,7 @@ void credentials_get(char **body, char **ctype, int *status, snac snac)
} }
xs_list *mastoapi_timeline(snac *user, const xs_dict *args, int skip, const char *index_fn) xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index_fn)
{ {
xs_list *out = xs_list_new(); xs_list *out = xs_list_new();
FILE *f; FILE *f;
@ -1269,7 +1269,7 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, int skip, const char
if (dbglevel) { if (dbglevel) {
xs *js = xs_json_dumps(args, 0); xs *js = xs_json_dumps(args, 0);
srv_log(xs_fmt("mastoapi_timeline args: %s", js)); srv_debug(1, xs_fmt("mastoapi_timeline args: %s", js));
} }
if ((f = fopen(index_fn, "r")) == NULL) if ((f = fopen(index_fn, "r")) == NULL)
@ -1288,7 +1288,7 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, int skip, const char
if (limit == 0) if (limit == 0)
limit = 20; limit = 20;
if (index_desc_first(f, md5, skip)) { if (index_desc_first(f, md5, 0)) {
do { do {
xs *msg = NULL; xs *msg = NULL;
@ -1314,8 +1314,14 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, int skip, const char
} }
/* get the entry */ /* get the entry */
if (!valid_status(timeline_get_by_md5(user, md5, &msg))) if (user) {
continue; if (!valid_status(timeline_get_by_md5(user, md5, &msg)))
continue;
}
else {
if (!valid_status(object_get_by_md5(md5, &msg)))
continue;
}
/* discard non-Notes */ /* discard non-Notes */
const char *id = xs_dict_get(msg, "id"); const char *id = xs_dict_get(msg, "id");
@ -1333,22 +1339,33 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, int skip, const char
if (from == NULL) if (from == NULL)
continue; continue;
/* is this message from a person we don't follow? */ if (user) {
if (strcmp(from, user->actor) && !following_check(user, from)) { /* is this message from a person we don't follow? */
/* discard if it was not boosted */ if (strcmp(from, user->actor) && !following_check(user, from)) {
xs *idx = object_announces(id); /* discard if it was not boosted */
xs *idx = object_announces(id);
if (xs_list_len(idx) == 0) if (xs_list_len(idx) == 0)
continue;
}
/* discard notes from muted morons */
if (is_muted(user, from))
continue;
/* discard hidden notes */
if (is_hidden(user, id))
continue; continue;
} }
else {
/* skip non-public messages */
if (!is_msg_public(msg))
continue;
/* discard notes from muted morons */ /* discard messages from private users */
if (is_muted(user, from)) if (is_msg_from_private_user(msg))
continue; continue;
}
/* discard hidden notes */
if (is_hidden(user, id))
continue;
/* if it has a name and it's not a Page or a Video, /* if it has a name and it's not a Page or a Video,
it's a poll vote, so discard it */ it's a poll vote, so discard it */
@ -1632,7 +1649,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
/* the private timeline */ /* the private timeline */
if (logged_in) { if (logged_in) {
xs *ifn = user_index_fn(&snac1, "private"); xs *ifn = user_index_fn(&snac1, "private");
xs *out = mastoapi_timeline(&snac1, args, 0, ifn); xs *out = mastoapi_timeline(&snac1, args, ifn);
*body = xs_json_dumps(out, 4); *body = xs_json_dumps(out, 4);
*ctype = "application/json"; *ctype = "application/json";