From 2a29fc102e8cb33a970ac1eb4c43bc7edbafd113 Mon Sep 17 00:00:00 2001 From: default Date: Sat, 7 Dec 2024 14:52:15 +0100 Subject: [PATCH 1/5] Added image/avif mime type. --- xs_mime.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xs_mime.h b/xs_mime.h index b016490..5c0a6fd 100644 --- a/xs_mime.h +++ b/xs_mime.h @@ -11,11 +11,12 @@ extern const char *xs_mime_types[]; #ifdef XS_IMPLEMENTATION /* intentionally brain-dead simple */ -/* CAUTION: sorted */ +/* CAUTION: sorted by extension */ const char *xs_mime_types[] = { "3gp", "video/3gpp", "aac", "audio/aac", + "avif", "image/avif", "css", "text/css", "flac", "audio/flac", "flv", "video/flv", From 8afc834fec5525a919c505ba5a3f281cb05efbd7 Mon Sep 17 00:00:00 2001 From: default Date: Mon, 9 Dec 2024 12:30:00 +0100 Subject: [PATCH 2/5] Fixed a bug in the 'Approve' and 'Discard' buttons. --- html.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/html.c b/html.c index edb7e1e..2c353d2 100644 --- a/html.c +++ b/html.c @@ -2576,15 +2576,6 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t, cons html_button("limit", L("Limit"), L("Block announces (boosts) from this user"))); } - else - if (pending_check(snac, actor_id)) { - xs_html_add(form, - html_button("approve", L("Approve"), - L("Approve this follow request"))); - - xs_html_add(form, - html_button("discard", L("Discard"), L("Discard this follow request"))); - } else { xs_html_add(form, html_button("follow", L("Follow"), @@ -2595,6 +2586,15 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t, cons html_button("delete", L("Delete"), L("Delete this user"))); } + if (pending_check(snac, actor_id)) { + xs_html_add(form, + html_button("approve", L("Approve"), + L("Approve this follow request"))); + + xs_html_add(form, + html_button("discard", L("Discard"), L("Discard this follow request"))); + } + if (is_muted(snac, actor_id)) xs_html_add(form, html_button("unmute", L("Unmute"), From aa130da06a215bc4782ecbd0b1a25de73fd6447e Mon Sep 17 00:00:00 2001 From: default Date: Mon, 9 Dec 2024 12:32:14 +0100 Subject: [PATCH 3/5] Updated RELEASE_NOTES. --- RELEASE_NOTES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2218c20..3ea55c5 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -6,6 +6,8 @@ As many users have asked for it, there is now an option to make the number of fo Some fixes to blocked instances code (posts from them were sometimes shown). +Fixed non-appearing buttons `Approve` and `Discard` if the account requesting a follow were being followed. + ## 2.65 Added a new user option to disable automatic follow confirmations (follow requests must be manually approved from the people page). From c78dd5f8e30ebe4a1339c00e1ab9e6d0ec285921 Mon Sep 17 00:00:00 2001 From: default Date: Mon, 9 Dec 2024 15:06:45 +0100 Subject: [PATCH 4/5] Updated RELEASE_NOTES. --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 3ea55c5..4630352 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,6 @@ # Release Notes -## UNRELEASED +## 2.66 As many users have asked for it, there is now an option to make the number of followed and following accounts public (still disabled by default). These are only the numbers; the lists themselves are never published. From 7808d7062508c1b4740eea508baf503dffd89a70 Mon Sep 17 00:00:00 2001 From: default Date: Mon, 9 Dec 2024 15:08:01 +0100 Subject: [PATCH 5/5] Version 2.66 RELEASED. --- snac.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snac.h b/snac.h index a3c055b..acc175f 100644 --- a/snac.h +++ b/snac.h @@ -1,7 +1,7 @@ /* snac - A simple, minimalistic ActivityPub instance */ /* copyright (c) 2022 - 2024 grunfink et al. / MIT license */ -#define VERSION "2.66-dev" +#define VERSION "2.66" #define USER_AGENT "snac/" VERSION