From 29caa37fd768df07de98c292c6db3196906cbf98 Mon Sep 17 00:00:00 2001 From: default Date: Sat, 16 Nov 2024 07:25:25 +0100 Subject: Allow underscores in hashtags. --- activitypub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activitypub.c b/activitypub.c index 0b2fc6a..031b9ac 100644 --- a/activitypub.c +++ b/activitypub.c @@ -724,7 +724,7 @@ xs_str *process_tags(snac *snac, const char *content, xs_list **tag) /* use this same server */ def_srv = xs_dup(xs_dict_get(srv_config, "host")); - split = xs_regex_split(content, "(@[A-Za-z0-9_]+(@[A-Za-z0-9\\.-]+)?|&#[0-9]+;|#[^[:punct:][:space:]]+)"); + split = xs_regex_split(content, "(@[A-Za-z0-9_]+(@[A-Za-z0-9\\.-]+)?|&#[0-9]+;|#(_|[^[:punct:][:space:]])+)"); p = split; while (xs_list_iter(&p, &v)) { -- cgit v1.2.3 From 90a959cb858711ea1dd9a802a4f86991abc1c904 Mon Sep 17 00:00:00 2001 From: default Date: Sat, 16 Nov 2024 07:26:44 +0100 Subject: Updated TODO. --- TODO.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/TODO.md b/TODO.md index 619364c..5054b1f 100644 --- a/TODO.md +++ b/TODO.md @@ -357,3 +357,7 @@ Fix a crash when posting from the links browser (2.63, 2024-11-08T15:57:25+0100) Fix some repeated images in Lemmy posts (2.63, 2024-11-08T15:57:25+0100). Fix a crash when posting an image from the tooot mobile app (2.63, 2024-11-11T19:42:11+0100). + +Fix some URL proxying (2.64, 2024-11-16T07:26:23+0100). + +Allow underscores in hashtags (2.64, 2024-11-16T07:26:23+0100). -- cgit v1.2.3 From 0858f57d8a17aac6c2ca7fc2fc6b7008486293fe Mon Sep 17 00:00:00 2001 From: default Date: Sun, 17 Nov 2024 10:09:41 +0100 Subject: Updated TODO. --- TODO.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TODO.md b/TODO.md index 5054b1f..5e0a302 100644 --- a/TODO.md +++ b/TODO.md @@ -16,6 +16,8 @@ Important: deleting a follower should do more that just delete the object, see h ## Wishlist +Add a pidfile. + Implement Proxying for Media Links to Enhance User Privacy (see https://codeberg.org/grunfink/snac2/issues/219 for more information). Consider showing only posts by the account owner (not full trees) (see https://codeberg.org/grunfink/snac2/issues/217 for more information). -- cgit v1.2.3 From 876c892960c7e45daf62369ea58f47ad42bfb98e Mon Sep 17 00:00:00 2001 From: default Date: Sun, 17 Nov 2024 10:21:15 +0100 Subject: The server creates a pidfile inside the base directory. --- httpd.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/httpd.c b/httpd.c index 1613e1f..81d2f9e 100644 --- a/httpd.c +++ b/httpd.c @@ -774,6 +774,7 @@ void httpd(void) xs *sem_name = NULL; xs *shm_name = NULL; sem_t anon_job_sem; + xs *pidfile = xs_fmt("%s/server.pid", srv_basedir); address = xs_dict_get(srv_config, "address"); @@ -809,6 +810,17 @@ void httpd(void) srv_log(xs_fmt("httpd%s start %s %s", p_state->use_fcgi ? " (FastCGI)" : "", full_address, USER_AGENT)); + { + FILE *f; + + if ((f = fopen(pidfile, "w")) != NULL) { + fprintf(f, "%d\n", getpid()); + fclose(f); + } + else + srv_log(xs_fmt("Cannot create %s: %s", pidfile, strerror(errno))); + } + /* show the number of usable file descriptors */ struct rlimit r; getrlimit(RLIMIT_NOFILE, &r); @@ -894,4 +906,6 @@ void httpd(void) srv_log(xs_fmt("httpd%s stop %s (run time: %s)", p_state->use_fcgi ? " (FastCGI)" : "", full_address, uptime)); + + unlink(pidfile); } -- cgit v1.2.3 From ec5ba68d00a5db05f61f539a6cde9d9906388e83 Mon Sep 17 00:00:00 2001 From: default Date: Sun, 17 Nov 2024 10:21:51 +0100 Subject: Updated TODO. --- TODO.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index 5e0a302..0d8c64d 100644 --- a/TODO.md +++ b/TODO.md @@ -16,8 +16,6 @@ Important: deleting a follower should do more that just delete the object, see h ## Wishlist -Add a pidfile. - Implement Proxying for Media Links to Enhance User Privacy (see https://codeberg.org/grunfink/snac2/issues/219 for more information). Consider showing only posts by the account owner (not full trees) (see https://codeberg.org/grunfink/snac2/issues/217 for more information). @@ -363,3 +361,5 @@ Fix a crash when posting an image from the tooot mobile app (2.63, 2024-11-11T19 Fix some URL proxying (2.64, 2024-11-16T07:26:23+0100). Allow underscores in hashtags (2.64, 2024-11-16T07:26:23+0100). + +Add a pidfile (2.64, 2024-11-17T10:21:29+0100). -- cgit v1.2.3 From 2416945748994def6a96163a939348a22ad541a3 Mon Sep 17 00:00:00 2001 From: default Date: Sun, 17 Nov 2024 10:23:43 +0100 Subject: In the insert cmdline op, don't re-add if it's already in the timeline. --- main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main.c b/main.c index c6fff5f..c285fac 100644 --- a/main.c +++ b/main.c @@ -558,7 +558,11 @@ int main(int argc, char *argv[]) if (data != NULL) { xs_json_dump(data, 4, stdout); enqueue_actor_refresh(&snac, xs_dict_get(data, "attributedTo"), 0); - timeline_add(&snac, url, data); + + if (!timeline_here(&snac, url)) + timeline_add(&snac, url, data); + else + printf("Post %s already here\n", url); } return 0; -- cgit v1.2.3 From 442b46abc0afeedfeffba7f5317fa5b350ef9c56 Mon Sep 17 00:00:00 2001 From: default Date: Sun, 17 Nov 2024 10:53:47 +0100 Subject: mastoapi: added more checks in the notifications code. --- mastoapi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mastoapi.c b/mastoapi.c index c9d71b9..f80c730 100644 --- a/mastoapi.c +++ b/mastoapi.c @@ -1784,6 +1784,10 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path, mn = xs_dict_append(mn, "created_at", xs_dict_get(noti, "date")); xs *acct = mastoapi_account(&snac1, actor); + + if (acct == NULL) + continue; + mn = xs_dict_append(mn, "account", acct); if (strcmp(type, "follow") != 0 && !xs_is_null(objid)) { -- cgit v1.2.3 From 437829a83376b9094689469d7d4c30eab48f556e Mon Sep 17 00:00:00 2001 From: default Date: Sun, 17 Nov 2024 11:08:25 +0100 Subject: mastoapi: more tweaks to notifications code. --- mastoapi.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mastoapi.c b/mastoapi.c index f80c730..73b9a8b 100644 --- a/mastoapi.c +++ b/mastoapi.c @@ -1727,11 +1727,11 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path, if (logged_in) { xs *l = notify_list(&snac1, 0, 64); xs *out = xs_list_new(); - xs_list *p = l; const xs_dict *v; const xs_list *excl = xs_dict_get(args, "exclude_types[]"); + const char *max_id = xs_dict_get(args, "max_id"); - while (xs_list_iter(&p, &v)) { + xs_list_foreach(l, v) { xs *noti = notify_get(&snac1, v); if (noti == NULL) @@ -1740,6 +1740,8 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path, const char *type = xs_dict_get(noti, "type"); const char *utype = xs_dict_get(noti, "utype"); const char *objid = xs_dict_get(noti, "objid"); + const char *id = xs_dict_get(noti, "id"); + xs *fid = xs_replace(id, ".", ""); xs *actor = NULL; xs *entry = NULL; @@ -1752,6 +1754,13 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path, if (is_hidden(&snac1, objid)) continue; + if (max_id) { + if (strcmp(fid, max_id) == 0) + max_id = NULL; + + continue; + } + /* convert the type */ if (strcmp(type, "Like") == 0 || strcmp(type, "EmojiReact") == 0) type = "favourite"; @@ -1778,8 +1787,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path, mn = xs_dict_append(mn, "type", type); - xs *id = xs_replace(xs_dict_get(noti, "id"), ".", ""); - mn = xs_dict_append(mn, "id", id); + mn = xs_dict_append(mn, "id", fid); mn = xs_dict_append(mn, "created_at", xs_dict_get(noti, "date")); -- cgit v1.2.3 From a7974cbaa7037292c8883271fc2d0983698882a6 Mon Sep 17 00:00:00 2001 From: François Kooman Date: Mon, 18 Nov 2024 11:46:14 +0100 Subject: do not autocapitalize "Login: " masto api field on Chrome/Safari the Mastodon API OAuth login page auto capitalizes the first char of the "Login: " field. This disabled that. --- mastoapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mastoapi.c b/mastoapi.c index c9d71b9..076f8aa 100644 --- a/mastoapi.c +++ b/mastoapi.c @@ -171,7 +171,7 @@ const char *login_page = "" "

%s OAuth identify

\n" "
%s
\n" "
\n" -"

Login:

\n" +"

Login:

\n" "

Password:

\n" "\n" "\n" -- cgit v1.2.3 From 4daacf6b9d60b6fc9fedbbf634ed1c9490095ba1 Mon Sep 17 00:00:00 2001 From: default Date: Mon, 18 Nov 2024 20:38:30 +0100 Subject: Updated TODO. --- TODO.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TODO.md b/TODO.md index 0d8c64d..0f2cbd0 100644 --- a/TODO.md +++ b/TODO.md @@ -16,10 +16,6 @@ Important: deleting a follower should do more that just delete the object, see h ## Wishlist -Implement Proxying for Media Links to Enhance User Privacy (see https://codeberg.org/grunfink/snac2/issues/219 for more information). - -Consider showing only posts by the account owner (not full trees) (see https://codeberg.org/grunfink/snac2/issues/217 for more information). - Add support for subscribing and posting to relays (see https://codeberg.org/grunfink/snac2/issues/216 for more information). The instance timeline should also show boosts from users. @@ -363,3 +359,7 @@ Fix some URL proxying (2.64, 2024-11-16T07:26:23+0100). Allow underscores in hashtags (2.64, 2024-11-16T07:26:23+0100). Add a pidfile (2.64, 2024-11-17T10:21:29+0100). + +Implement Proxying for Media Links to Enhance User Privacy (see https://codeberg.org/grunfink/snac2/issues/219 for more information) (2024-11-18T20:36:39+0100). + +Consider showing only posts by the account owner (not full trees) (see https://codeberg.org/grunfink/snac2/issues/217 for more information) (2024-11-18T20:36:39+0100). -- cgit v1.2.3 From 085caa7747a3bbebbd2ec09b3264dc6fcc5a7624 Mon Sep 17 00:00:00 2001 From: default Date: Tue, 19 Nov 2024 06:46:14 +0100 Subject: New function get_in_reply_to(). --- activitypub.c | 18 +++++++++++++++--- html.c | 4 ++-- mastoapi.c | 2 +- snac.h | 1 + 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/activitypub.c b/activitypub.c index 031b9ac..473675d 100644 --- a/activitypub.c +++ b/activitypub.c @@ -183,6 +183,18 @@ const char *get_atto(const xs_dict *msg) } +const char *get_in_reply_to(const xs_dict *msg) +/* gets the inReplyTo id */ +{ + const xs_val *in_reply_to = xs_dict_get(msg, "inReplyTo"); + + if (xs_type(in_reply_to) == XSTYPE_DICT) + in_reply_to = xs_dict_get(in_reply_to, "id"); + + return in_reply_to; +} + + xs_list *get_attachments(const xs_dict *msg) /* unify the garbage fire that are the attachments */ { @@ -373,7 +385,7 @@ int timeline_request(snac *snac, const char **id, xs_str **wrk, int level) } /* does it have an ancestor? */ - const char *in_reply_to = xs_dict_get(object, "inReplyTo"); + const char *in_reply_to = get_in_reply_to(object); /* store */ timeline_add(snac, nid, object); @@ -671,7 +683,7 @@ int is_msg_for_me(snac *snac, const xs_dict *c_msg) return 3; /* is this message a reply to another? */ - const char *irt = xs_dict_get(msg, "inReplyTo"); + const char *irt = get_in_reply_to(msg); if (!xs_is_null(irt)) { xs *r_msg = NULL; @@ -1957,7 +1969,7 @@ int process_input_message(snac *snac, const xs_dict *msg, const xs_dict *req) if (xs_match(utype, "Note|Article")) { /** **/ const char *id = xs_dict_get(object, "id"); - const char *in_reply_to = xs_dict_get(object, "inReplyTo"); + const char *in_reply_to = get_in_reply_to(object); const char *atto = get_atto(object); xs *wrk = NULL; diff --git a/html.c b/html.c index 3a2b14f..74de47d 100644 --- a/html.c +++ b/html.c @@ -1670,7 +1670,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only, if (strcmp(type, "Note") == 0) { if (level == 0) { /* is the parent not here? */ - const char *parent = xs_dict_get(msg, "inReplyTo"); + const char *parent = get_in_reply_to(msg); if (user && !xs_is_null(parent) && *parent && !timeline_here(user, parent)) { xs_html_add(post_header, @@ -2329,7 +2329,7 @@ xs_str *html_timeline(snac *user, const xs_list *list, int read_only, /* is this message a non-public reply? */ if (user != NULL && !is_msg_public(msg)) { - const char *irt = xs_dict_get(msg, "inReplyTo"); + const char *irt = get_in_reply_to(msg); /* is it a reply to something not in the storage? */ if (!xs_is_null(irt) && !object_here(irt)) { diff --git a/mastoapi.c b/mastoapi.c index 825f207..1dd91dc 100644 --- a/mastoapi.c +++ b/mastoapi.c @@ -1024,7 +1024,7 @@ xs_dict *mastoapi_status(snac *snac, const xs_dict *msg) st = xs_dict_append(st, "in_reply_to_id", xs_stock(XSTYPE_NULL)); st = xs_dict_append(st, "in_reply_to_account_id", xs_stock(XSTYPE_NULL)); - tmp = xs_dict_get(msg, "inReplyTo"); + tmp = get_in_reply_to(msg); if (!xs_is_null(tmp)) { xs *irto = NULL; diff --git a/snac.h b/snac.h index ad2793e..8020978 100644 --- a/snac.h +++ b/snac.h @@ -296,6 +296,7 @@ const char *default_avatar_base64(void); xs_str *process_tags(snac *snac, const char *content, xs_list **tag); const char *get_atto(const xs_dict *msg); +const char *get_in_reply_to(const xs_dict *msg); xs_list *get_attachments(const xs_dict *msg); xs_dict *msg_admiration(snac *snac, const char *object, const char *type); -- cgit v1.2.3 From fc9ba8f02647035e2d9ebcc29b32c586f90a10fd Mon Sep 17 00:00:00 2001 From: default Date: Tue, 19 Nov 2024 06:59:53 +0100 Subject: More usage of get_in_reply_to(). --- data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data.c b/data.c index 1cd69a5..f2fa521 100644 --- a/data.c +++ b/data.c @@ -799,7 +799,7 @@ int _object_add(const char *id, const xs_dict *obj, int ow) fclose(f); /* does this object has a parent? */ - const char *in_reply_to = xs_dict_get(obj, "inReplyTo"); + const char *in_reply_to = get_in_reply_to(obj); if (!xs_is_null(in_reply_to) && *in_reply_to) { /* update the children index of the parent */ -- cgit v1.2.3 From 3a9118524831d1f3a9168034c1655e515f162020 Mon Sep 17 00:00:00 2001 From: default Date: Tue, 19 Nov 2024 15:51:32 +0100 Subject: Updated documentation. --- doc/snac.5 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/snac.5 b/doc/snac.5 index 1b28d25..0168430 100644 --- a/doc/snac.5 +++ b/doc/snac.5 @@ -209,6 +209,8 @@ web interface. .It Pa history/ This directory contains generated HTML files. They may be snapshots of the local timeline in previous months or other cached data. +.It Pa server.pid +This file stores the server PID in a single text line. .El .Sh SEE ALSO .Xr snac 1 , -- cgit v1.2.3