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

notify_list() no longer has a new_only argument.

Browse source
This commit is contained in:
default 2024-02-05 10:18:38 +01:00
parent 823cb05fe5
commit 729ad476f0
4 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
data.c
View file

@ -2064,15 +2064,34 @@ xs_dict *notify_get(snac *snac, const char *id)
} }
xs_list *notify_list(snac *snac, int new_only) int notify_new_num(snac *snac)
/* counts the number of new notifications */
{
xs *t = notify_check_time(snac, 0);
xs *spec = xs_fmt("%s/notify/" "*.json", snac->basedir);
xs *lst = xs_glob(spec, 1, 1);
int cnt = 0;
xs_list *p = lst;
xs_str *v;
while (xs_list_iter(&p, &v)) {
xs *id = xs_replace(v, ".json", "");
/* old? count no more */
if (strcmp(id, t) < 0)
break;
cnt++;
}
return cnt;
}
xs_list *notify_list(snac *snac)
/* returns a list of notification ids, optionally only the new ones */ /* returns a list of notification ids, optionally only the new ones */
{ {
xs *t = NULL;
/* if only new ones are requested, get the last time */
if (new_only)
t = notify_check_time(snac, 0);
xs *spec = xs_fmt("%s/notify/" "*.json", snac->basedir); xs *spec = xs_fmt("%s/notify/" "*.json", snac->basedir);
xs *lst = xs_glob(spec, 1, 1); xs *lst = xs_glob(spec, 1, 1);
xs_list *out = xs_list_new(); xs_list *out = xs_list_new();
@ -2082,10 +2101,6 @@ xs_list *notify_list(snac *snac, int new_only)
while (xs_list_iter(&p, &v)) { while (xs_list_iter(&p, &v)) {
xs *id = xs_replace(v, ".json", ""); xs *id = xs_replace(v, ".json", "");
/* old? */
if (t != NULL && strcmp(id, t) < 0)
continue;
out = xs_list_append(out, id); out = xs_list_append(out, id);
} }

5
html.c
View file

@ -673,8 +673,7 @@ static xs_html *html_user_body(snac *user, int local)
xs_html_text(L("private")))); xs_html_text(L("private"))));
} }
else { else {
xs *n_list = notify_list(user, 1); int n_len = notify_new_num(user);
int n_len = xs_list_len(n_list);
xs_html *notify_count = NULL; xs_html *notify_count = NULL;
/* show the number of new notifications, if there are any */ /* show the number of new notifications, if there are any */
@ -2138,7 +2137,7 @@ xs_str *html_people(snac *user)
xs_str *html_notifications(snac *user) xs_str *html_notifications(snac *user)
{ {
xs *n_list = notify_list(user, 0); xs *n_list = notify_list(user);
xs *n_time = notify_check_time(user, 0); xs *n_time = notify_check_time(user, 0);
xs_html *body = html_user_body(user, 0); xs_html *body = html_user_body(user, 0);

2
mastoapi.c
View file

@ -1542,7 +1542,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
else else
if (strcmp(cmd, "/v1/notifications") == 0) { /** **/ if (strcmp(cmd, "/v1/notifications") == 0) { /** **/
if (logged_in) { if (logged_in) {
xs *l = notify_list(&snac1, 0); xs *l = notify_list(&snac1);
xs *out = xs_list_new(); xs *out = xs_list_new();
xs_list *p = l; xs_list *p = l;
xs_dict *v; xs_dict *v;

3
snac.h
View file

@ -187,7 +187,8 @@ xs_str *notify_check_time(snac *snac, int reset);
void notify_add(snac *snac, const char *type, const char *utype, void notify_add(snac *snac, const char *type, const char *utype,
const char *actor, const char *objid); const char *actor, const char *objid);
xs_dict *notify_get(snac *snac, const char *id); xs_dict *notify_get(snac *snac, const char *id);
xs_list *notify_list(snac *snac, int new_only); int notify_new_num(snac *snac);
xs_list *notify_list(snac *snac);
void notify_clear(snac *snac); void notify_clear(snac *snac);
void inbox_add(const char *inbox); void inbox_add(const char *inbox);