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

Merge pull request 'Pagination of the private and public page' (#13) from kensanata/snac2:pagination into master

Browse source 
Reviewed-on: https://codeberg.org/grunfink/snac2/pulls/13
This commit is contained in:
grunfink 2022-12-07 08:33:09 +00:00
commit 060a9fcb3c
5 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activitypub.c
View file

@ -1094,7 +1094,7 @@ int activitypub_get_handler(d_char *req, char *q_path,
else else
if (strcmp(p_path, "outbox") == 0) { if (strcmp(p_path, "outbox") == 0) {
xs *id = xs_fmt("%s/outbox", snac.actor); xs *id = xs_fmt("%s/outbox", snac.actor);
xs *elems = timeline_simple_list(&snac, "public", 20); xs *elems = timeline_simple_list(&snac, "public", 0, 20);
xs *list = xs_list_new(); xs *list = xs_list_new();
msg = msg_collection(&snac, id); msg = msg_collection(&snac, id);
char *p, *v; char *p, *v;

20
data.c
View file

@ -359,7 +359,7 @@ d_char *index_list(const char *fn, int max)
} }
d_char *index_list_desc(const char *fn, int max) d_char *index_list_desc(const char *fn, int skip, int show)
/* returns an index as a list, in reverse order */ /* returns an index as a list, in reverse order */
{ {
d_char *list = NULL; d_char *list = NULL;
@ -372,9 +372,9 @@ d_char *index_list_desc(const char *fn, int max)
char line[256]; char line[256];
list = xs_list_new(); list = xs_list_new();
/* move to the end minus one entry */ /* move to the end minus one entry (or more, if skipping entries) */
if (!fseek(f, 0, SEEK_END) && !fseek(f, -33, SEEK_CUR)) { if (!fseek(f, 0, SEEK_END) && !fseek(f, (skip + 1) * -33, SEEK_CUR)) {
while (n < max && fgets(line, sizeof(line), f) != NULL) { while (n < show && fgets(line, sizeof(line), f) != NULL) {
line[32] = '\0'; line[32] = '\0';
list = xs_list_append(list, line); list = xs_list_append(list, line);
n++; n++;
@ -856,7 +856,7 @@ d_char *timeline_top_level(d_char *list)
} }
d_char *timeline_simple_list(snac *snac, const char *idx_name, int max) d_char *timeline_simple_list(snac *snac, const char *idx_name, int skip, int show)
/* returns a timeline (with all entries) */ /* returns a timeline (with all entries) */
{ {
int c_max; int c_max;
@ -865,19 +865,19 @@ d_char *timeline_simple_list(snac *snac, const char *idx_name, int max)
c_max = xs_number_get(xs_dict_get(srv_config, "max_timeline_entries")); c_max = xs_number_get(xs_dict_get(srv_config, "max_timeline_entries"));
/* never more timeline entries than the configured maximum */ /* never more timeline entries than the configured maximum */
if (max > c_max) if (show > c_max)
max = c_max; show = c_max;
xs *idx = xs_fmt("%s/%s.idx", snac->basedir, idx_name); xs *idx = xs_fmt("%s/%s.idx", snac->basedir, idx_name);
return index_list_desc(idx, max); return index_list_desc(idx, skip, show);
} }
d_char *timeline_list(snac *snac, const char *idx_name, int max) d_char *timeline_list(snac *snac, const char *idx_name, int skip, int show)
/* returns a timeline (only top level entries) */ /* returns a timeline (only top level entries) */
{ {
xs *list = timeline_simple_list(snac, idx_name, max); xs *list = timeline_simple_list(snac, idx_name, skip, show);
return timeline_top_level(list); return timeline_top_level(list);
} }

37
html.c
View file

@ -967,6 +967,7 @@ int html_get_handler(d_char *req, char *q_path, char **body, int *b_size, char *
xs *uid = NULL; xs *uid = NULL;
char *p_path; char *p_path;
int cache = 1; int cache = 1;
int save = 1;
char *v; char *v;
xs *l = xs_split_n(q_path, "/", 2); xs *l = xs_split_n(q_path, "/", 2);
@ -1004,6 +1005,14 @@ int html_get_handler(d_char *req, char *q_path, char **body, int *b_size, char *
if ((v = xs_dict_get(srv_config, "disable_cache")) && xs_type(v) == XSTYPE_TRUE) if ((v = xs_dict_get(srv_config, "disable_cache")) && xs_type(v) == XSTYPE_TRUE)
cache = 0; cache = 0;
int skip = 0;
int show = 50;
char *q_vars = xs_dict_get(req, "q_vars");
if ((v = xs_dict_get(q_vars, "skip")) != NULL)
skip = atoi(v), cache = 0, save = 0;
if ((v = xs_dict_get(q_vars, "show")) != NULL)
show = atoi(v), cache = 0, save = 0;
if (p_path == NULL) { if (p_path == NULL) {
/* public timeline */ /* public timeline */
xs *h = xs_str_localtime(0, "%Y-%m.html"); xs *h = xs_str_localtime(0, "%Y-%m.html");
@ -1016,13 +1025,20 @@ int html_get_handler(d_char *req, char *q_path, char **body, int *b_size, char *
status = 200; status = 200;
} }
else { else {
xs *list = timeline_list(&snac, "public", XS_ALL); xs *list = timeline_list(&snac, "public", skip, show);
*body = html_timeline(&snac, list, 1); *body = html_timeline(&snac, list, 1);
if (xs_list_len(list) == show)
*body = xs_str_cat(
*body, xs_fmt(
"<p>"
"<a href=\"%s?skip=%d&show=%d\" name=\"snac-more\">More…</a>"
"</p>\n", snac.actor, skip + show, show));
*b_size = strlen(*body); *b_size = strlen(*body);
status = 200; status = 200;
history_add(&snac, h, *body, *b_size); if (save)
history_add(&snac, h, *body, *b_size);
} }
} }
else else
@ -1042,13 +1058,20 @@ int html_get_handler(d_char *req, char *q_path, char **body, int *b_size, char *
else { else {
snac_debug(&snac, 1, xs_fmt("building timeline")); snac_debug(&snac, 1, xs_fmt("building timeline"));
xs *list = timeline_list(&snac, "private", XS_ALL); xs *list = timeline_list(&snac, "private", skip, show);
*body = html_timeline(&snac, list, 0); *body = html_timeline(&snac, list, 0);
if (xs_list_len(list) == show)
*body = xs_str_cat(
*body, xs_fmt(
"<p>"
"<a href=\"%s/admin?skip=%d&show=%d\" name=\"snac-more\">More…</a>"
"</p>\n", snac.actor, skip + show, show));
*b_size = strlen(*body); *b_size = strlen(*body);
status = 200; status = 200;
history_add(&snac, "timeline.html_", *body, *b_size); if (save)
history_add(&snac, "timeline.html_", *body, *b_size);
} }
} }
} }
@ -1109,7 +1132,7 @@ int html_get_handler(d_char *req, char *q_path, char **body, int *b_size, char *
if (strcmp(p_path, ".rss") == 0) { if (strcmp(p_path, ".rss") == 0) {
/* public timeline in RSS format */ /* public timeline in RSS format */
d_char *rss; d_char *rss;
xs *elems = timeline_simple_list(&snac, "public", 20); xs *elems = timeline_simple_list(&snac, "public", 0, 20);
xs *bio = not_really_markdown(xs_dict_get(snac.config, "bio")); xs *bio = not_really_markdown(xs_dict_get(snac.config, "bio"));
char *p, *v; char *p, *v;
@ -1202,7 +1225,7 @@ int html_post_handler(d_char *req, char *q_path, d_char *payload, int p_size,
uid = xs_list_get(l, 1); uid = xs_list_get(l, 1);
if (!uid || !user_open(&snac, uid)) { if (!uid || !user_open(&snac, uid)) {
/* invalid user */ /* invalid user */
srv_log(xs_fmt("html_get_handler bad user %s", uid)); srv_log(xs_fmt("html_post_handler bad user %s", uid));
return 404; return 404;
} }

2
main.c
View file

@ -159,7 +159,7 @@ int main(int argc, char *argv[])
#endif #endif
xs *idx = xs_fmt("%s/private.idx", snac.basedir); xs *idx = xs_fmt("%s/private.idx", snac.basedir);
xs *list = index_list_desc(idx, 256); xs *list = index_list_desc(idx, 0, 256);
xs *tl = timeline_top_level(list); xs *tl = timeline_top_level(list);
xs *j = xs_json_dumps_pp(tl, 4); xs *j = xs_json_dumps_pp(tl, 4);

6
snac.h
View file

@ -58,7 +58,7 @@ int index_add(const char *fn, const char *md5);
int index_del(const char *fn, const char *md5); int index_del(const char *fn, const char *md5);
int index_first(const char *fn, char *buf, int size); int index_first(const char *fn, char *buf, int size);
d_char *index_list(const char *fn, int max); d_char *index_list(const char *fn, int max);
d_char *index_list_desc(const char *fn, int max); d_char *index_list_desc(const char *fn, int skip, int show);
int object_add(const char *id, d_char *obj); int object_add(const char *id, d_char *obj);
int object_add_ow(const char *id, d_char *obj); int object_add_ow(const char *id, d_char *obj);
@ -85,8 +85,8 @@ d_char *follower_list(snac *snac);
double timeline_mtime(snac *snac); double timeline_mtime(snac *snac);
int timeline_del(snac *snac, char *id); int timeline_del(snac *snac, char *id);
d_char *timeline_simple_list(snac *snac, const char *idx_name, int max); d_char *timeline_simple_list(snac *snac, const char *idx_name, int skip, int show);
d_char *timeline_list(snac *snac, const char *idx_name, int max); d_char *timeline_list(snac *snac, const char *idx_name, int skip, int show);
int timeline_add(snac *snac, char *id, char *o_msg, char *parent, char *referrer); int timeline_add(snac *snac, char *id, char *o_msg, char *parent, char *referrer);
void timeline_admire(snac *snac, char *o_msg, char *id, char *admirer, int like); void timeline_admire(snac *snac, char *o_msg, char *id, char *admirer, int like);