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

Merge branch 'master' into style-tweaks-on-2.52

Browse source
This commit is contained in:
Kelson Vibber 2024-05-09 04:42:35 +00:00
commit c17a225ce2
5 changed files with 89 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
data.c
View file

@ -1830,7 +1830,37 @@ xs_val *list_maint(snac *user, const char *list, int op)
}
break;
case 3: /** get list name **/
if (xs_is_hex(list)) {
FILE *f;
xs *fn = xs_fmt("%s/list/%s.id", user->basedir, list);
if ((f = fopen(fn, "r")) != NULL) {
l = xs_strip_i(xs_readline(f));
fclose(f);
}
}
break;
}
return l;
}
xs_list *list_timeline(snac *user, const char *list, int skip, int show)
/* returns the timeline of a list */
{
xs_list *l = NULL;
if (!xs_is_hex(list))
return NULL;
xs *fn = xs_fmt("%s/list/%s.idx", user->basedir, list);
if (mtime(fn) > 0.0)
l = index_list_desc(fn, skip, show);
return l;
}
@ -1869,11 +1899,8 @@ xs_val *list_content(snac *user, const char *list, const char *actor_md5, int op
break;
case 3: /** list timeline **/
fn = xs_replace_i(fn, ".lst", ".idx");
l = index_list_desc(fn, 0, 2048);
default:
srv_log(xs_fmt("ERROR: list_content: bad op %d", op));
break;
}

75
html.c
View file

@ -509,7 +509,7 @@ xs_html *html_instance_head(void)
}
static xs_html *html_instance_body(char *tag)
static xs_html *html_instance_body(void)
{
char *host = xs_dict_get(srv_config, "host");
char *sdesc = xs_dict_get(srv_config, "short_description");
@ -560,16 +560,6 @@ static xs_html *html_instance_body(char *tag)
xs_html_text(handle)))));
}
{
xs *l = tag ? xs_fmt(L("Search results for #%s"), tag) :
xs_dup(L("Recent posts by users in this instance"));
xs_html_add(body,
xs_html_tag("h2",
xs_html_attr("class", "snac-header"),
xs_html_text(l)));
}
return body;
}
@ -1265,8 +1255,8 @@ xs_html *html_entry_controls(snac *snac, char *actor, const xs_dict *msg, const
}
if (is_msg_public(msg)) {
if (strcmp(actor, snac->actor) == 0 || xs_list_in(boosts, snac->md5) == -1) {
/* not already boosted or us; add button */
if (xs_list_in(boosts, snac->md5) == -1) {
/* not already boosted; add button */
xs_html_add(form,
html_button("boost", L("Boost"), L("Announce this post to your followers")));
}
@ -1996,7 +1986,7 @@ xs_html *html_footer(void)
xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
int skip, int show, int show_more,
char *tag, char *page, int utl)
char *title, char *page, int utl)
/* returns the HTML for the timeline */
{
xs_list *p = (xs_list *)list;
@ -2026,7 +2016,7 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
}
else {
head = html_instance_head();
body = html_instance_body(tag);
body = html_instance_body();
}
xs_html *html = xs_html_tag("html",
@ -2037,6 +2027,13 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
xs_html_add(body,
html_top_controls(user));
if (title) {
xs_html_add(body,
xs_html_tag("h2",
xs_html_attr("class", "snac-header"),
xs_html_text(title)));
}
xs_html_add(body,
xs_html_tag("a",
xs_html_attr("name", "snac-posts")));
@ -2126,25 +2123,22 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
}
if (show_more) {
xs *t = NULL;
xs *m = NULL;
xs *ss = xs_fmt("skip=%d&show=%d", skip + show, show);
xs *url = page == NULL || user == NULL ?
xs_dup(srv_baseurl) : xs_fmt("%s%s", user->actor, page);
xs *url = xs_dup(user == NULL ? srv_baseurl : user->actor);
if (tag) {
t = xs_fmt("%s?t=%s", url, tag);
m = xs_fmt("%s&%s", t, ss);
}
else {
t = xs_dup(url);
m = xs_fmt("%s?%s", t, ss);
}
if (page != NULL)
url = xs_str_cat(url, page);
if (xs_str_in(url, "?") != -1)
m = xs_fmt("%s&%s", url, ss);
else
m = xs_fmt("%s?%s", url, ss);
xs_html *more_links = xs_html_tag("p",
xs_html_tag("a",
xs_html_attr("href", t),
xs_html_attr("href", url),
xs_html_attr("name", "snac-more"),
xs_html_text(L("Back to top"))),
xs_html_text(" - "),
@ -2652,12 +2646,37 @@ int html_get_handler(const xs_dict *req, const char *q_path,
xs *next = timeline_instance_list(skip + show, 1);
*body = html_timeline(&snac, list, 0, skip, show,
xs_list_len(next), NULL, "/instance", 0);
xs_list_len(next), L("Showing instance timeline"), "/instance", 0);
*b_size = strlen(*body);
status = 200;
}
}
else
if (xs_startswith(p_path, "list/")) { /** list timelines **/
if (!login(&snac, req)) {
*body = xs_dup(uid);
status = 401;
}
else {
xs *l = xs_split(p_path, "/");
char *lid = xs_list_get(l, -1);
xs *list = list_timeline(&snac, lid, skip, show);
xs *next = list_timeline(&snac, lid, skip + show, 1);
if (list != NULL) {
xs *base = xs_fmt("/list/%s", lid);
xs *name = list_maint(&snac, lid, 3);
xs *title = xs_fmt(L("Showing timeline for list %s"), name);
*body = html_timeline(&snac, list, 0, skip, show,
xs_list_len(next), title, base, 1);
*b_size = strlen(*body);
status = 200;
}
}
}
else
if (xs_startswith(p_path, "p/")) { /** a timeline with just one entry **/
if (xs_type(xs_dict_get(snac.config, "private")) == XSTYPE_TRUE)
return 403;

10
httpd.c
View file

@ -200,14 +200,18 @@ int server_get_handler(xs_dict *req, const char *q_path,
*body = timeline_to_rss(NULL, tl, link, link, link);
*ctype = "application/rss+xml; charset=utf-8";
}
else
*body = html_timeline(NULL, tl, 0, skip, show, more, t, NULL, 0);
else {
xs *page = xs_fmt("?t=%s", t);
xs *title = xs_fmt(L("Search results for #%s"), t);
*body = html_timeline(NULL, tl, 0, skip, show, more, title, page, 0);
}
}
else
if (xs_type(xs_dict_get(srv_config, "show_instance_timeline")) == XSTYPE_TRUE) {
/** instance timeline **/
xs *tl = timeline_instance_list(0, 30);
*body = html_timeline(NULL, tl, 0, 0, 0, 0, NULL, NULL, 0);
*body = html_timeline(NULL, tl, 0, 0, 0, 0,
L("Recent posts by users in this instance"), NULL, 0);
}
else
*body = greeting_html();

2
mastoapi.c
View file

@ -1669,7 +1669,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
xs *l = xs_split(cmd, "/");
char *list = xs_list_get(l, -1);
xs *timeline = list_content(&snac1, list, NULL, 3);
xs *timeline = list_timeline(&snac1, list, 0, 2048);
xs *out = xs_list_new();
int c = 0;
char *md5;

3
snac.h
View file

@ -175,6 +175,7 @@ void tag_index(const char *id, const xs_dict *obj);
xs_list *tag_search(char *tag, int skip, int show);
xs_val *list_maint(snac *user, const char *list, int op);
xs_list *list_timeline(snac *user, const char *list, int skip, int show);
xs_val *list_content(snac *user, const char *list_id, const char *actor_md5, int op);
void list_distribute(snac *user, const char *who, const xs_dict *post);
@ -317,7 +318,7 @@ xs_str *encode_html(const char *str);
xs_str *html_timeline(snac *user, const xs_list *list, int read_only,
int skip, int show, int show_more,
char *tag, char *page, int utl);
char *title, char *page, int utl);
int html_get_handler(const xs_dict *req, const char *q_path,
char **body, int *b_size, char **ctype, xs_str **etag);