monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-15 01:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use index_desc_first() / index_desc_next() in mastoapi_timeline().

Browse source
This commit is contained in:
default 2024-08-09 16:57:14 +02:00
parent f5332ec016
commit 339dc1a325
1 changed files with 85 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
mastoapi.c
View file

@ -1261,9 +1261,20 @@ void credentials_get(char **body, char **ctype, int *status, snac snac)
} }
xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index) xs_list *mastoapi_timeline(snac *user, const xs_dict *args, int skip, const char *index_fn)
{ {
xs_list *out = xs_list_new(); xs_list *out = xs_list_new();
FILE *f;
char md5[MD5_HEX_SIZE];
if (dbglevel) {
xs *js = xs_json_dumps(args, 0);
srv_log(xs_fmt("mastoapi_timeline args: %s", js));
}
if ((f = fopen(index_fn, "r")) == NULL)
return out;
const char *max_id = xs_dict_get(args, "max_id"); const char *max_id = xs_dict_get(args, "max_id");
const char *since_id = xs_dict_get(args, "since_id"); const char *since_id = xs_dict_get(args, "since_id");
const char *min_id = xs_dict_get(args, "min_id"); const char *min_id = xs_dict_get(args, "min_id");
@ -1277,17 +1288,13 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index)
if (limit == 0) if (limit == 0)
limit = 20; limit = 20;
xs *timeline = timeline_simple_list(user, index, 0, 2048); if (index_desc_first(f, md5, skip)) {
do {
xs_list *p = timeline;
const xs_str *v;
while (xs_list_iter(&p, &v) && cnt < limit) {
xs *msg = NULL; xs *msg = NULL;
/* only return entries older that max_id */ /* only return entries older that max_id */
if (max_id) { if (max_id) {
if (strcmp(v, MID_TO_MD5(max_id)) == 0) if (strcmp(md5, MID_TO_MD5(max_id)) == 0)
max_id = NULL; max_id = NULL;
continue; continue;
@ -1295,19 +1302,19 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index)
/* only returns entries newer than since_id */ /* only returns entries newer than since_id */
if (since_id) { if (since_id) {
if (strcmp(v, MID_TO_MD5(since_id)) == 0) if (strcmp(md5, 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, MID_TO_MD5(min_id)) == 0) if (strcmp(md5, MID_TO_MD5(min_id)) == 0)
break; break;
} }
/* get the entry */ /* get the entry */
if (!valid_status(timeline_get_by_md5(user, v, &msg))) if (!valid_status(timeline_get_by_md5(user, md5, &msg)))
continue; continue;
/* discard non-Notes */ /* discard non-Notes */
@ -1355,8 +1362,13 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index)
out = xs_list_append(out, st); out = xs_list_append(out, st);
cnt++; cnt++;
} while (cnt < limit && index_desc_next(f, md5));
} }
fclose(f);
srv_debug(1, xs_fmt("mastoapi_timeline: %d %d", cnt, xs_list_len(out)));
return out; return out;
} }
@ -1619,7 +1631,8 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
if (strcmp(cmd, "/v1/timelines/home") == 0) { /** **/ if (strcmp(cmd, "/v1/timelines/home") == 0) { /** **/
/* the private timeline */ /* the private timeline */
if (logged_in) { if (logged_in) {
xs *out = mastoapi_timeline(&snac1, args, "private"); xs *ifn = user_index_fn(&snac1, "private");
xs *out = mastoapi_timeline(&snac1, args, 0, ifn);
*body = xs_json_dumps(out, 4); *body = xs_json_dumps(out, 4);
*ctype = "application/json"; *ctype = "application/json";