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

User search can also be done by tag.

Browse source
This commit is contained in:
default 2024-05-15 05:57:21 +02:00
parent 281f934f74
commit 34311714ce
2 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
html.c
View file

@ -748,7 +748,7 @@ static xs_html *html_user_body(snac *user, int read_only)
xs_html_sctag("input", xs_html_sctag("input",
xs_html_attr("type", "text"), xs_html_attr("type", "text"),
xs_html_attr("name", "q"), xs_html_attr("name", "q"),
xs_html_attr("title", L("Search posts by content (regular expression)")), xs_html_attr("title", L("Search posts by content (regular expression) or #tag")),
xs_html_attr("placeholder", L("Content search"))))); xs_html_attr("placeholder", L("Content search")))));
} }
@ -2588,25 +2588,44 @@ int html_get_handler(const xs_dict *req, const char *q_path,
char *q = xs_dict_get(q_vars, "q"); char *q = xs_dict_get(q_vars, "q");
if (q && *q) { if (q && *q) {
/** search by content **/ if (*q == '#') {
int to = 0; /** search by tag **/
int msecs = atoi(xs_dict_get_def(q_vars, "msecs", "0")); xs *tl = tag_search(q, skip, show + 1);
xs *tl = content_search(&snac, q, 1, skip, show, msecs, &to); int more = 0;
xs *title = NULL; if (xs_list_len(tl) >= show + 1) {
xs *page = xs_fmt("/admin?q=%s&msecs=%d", q, msecs + 10); /* drop the last one */
int tl_len = xs_list_len(tl); tl = xs_list_del(tl, -1);
more = 1;
}
if (tl_len) xs *page = xs_fmt("/admin?q=%%23%s", q + 1);
title = xs_fmt(L("Search results for '%s'"), q); xs *title = xs_fmt(L("Search results for tag %s"), q);
else
if (skip)
title = xs_fmt(L("No more matches for '%s'"), q);
else
title = xs_fmt(L("Nothing found for '%s'"), q);
*body = html_timeline(&snac, tl, 0, skip, tl_len, to || tl_len == show, title, page, 0); *body = html_timeline(&snac, tl, 0, skip, show, more, title, page, 0);
*b_size = strlen(*body); *b_size = strlen(*body);
status = 200; status = 200;
}
else {
/** search by content **/
int to = 0;
int msecs = atoi(xs_dict_get_def(q_vars, "msecs", "0"));
xs *tl = content_search(&snac, q, 1, skip, show, msecs, &to);
xs *title = NULL;
xs *page = xs_fmt("/admin?q=%s&msecs=%d", q, msecs + 10);
int tl_len = xs_list_len(tl);
if (tl_len)
title = xs_fmt(L("Search results for '%s'"), q);
else
if (skip)
title = xs_fmt(L("No more matches for '%s'"), q);
else
title = xs_fmt(L("Nothing found for '%s'"), q);
*body = html_timeline(&snac, tl, 0, skip, tl_len, to || tl_len == show, title, page, 0);
*b_size = strlen(*body);
status = 200;
}
} }
else { else {
double t = history_mtime(&snac, "timeline.html_"); double t = history_mtime(&snac, "timeline.html_");

2
httpd.c
View file

@ -202,7 +202,7 @@ int server_get_handler(xs_dict *req, const char *q_path,
} }
else { else {
xs *page = xs_fmt("?t=%s", t); xs *page = xs_fmt("?t=%s", t);
xs *title = xs_fmt(L("Search results for #%s"), t); xs *title = xs_fmt(L("Search results for tag #%s"), t);
*body = html_timeline(NULL, tl, 0, skip, show, more, title, page, 0); *body = html_timeline(NULL, tl, 0, skip, show, more, title, page, 0);
} }
} }