summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RELEASE_NOTES.md4
-rw-r--r--html.c18
-rw-r--r--snac.h2
3 files changed, 13 insertions, 11 deletions
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 2218c20..4630352 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,11 +1,13 @@
1# Release Notes 1# Release Notes
2 2
3## UNRELEASED 3## 2.66
4 4
5As 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. 5As 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.
6 6
7Some fixes to blocked instances code (posts from them were sometimes shown). 7Some fixes to blocked instances code (posts from them were sometimes shown).
8 8
9Fixed non-appearing buttons `Approve` and `Discard` if the account requesting a follow were being followed.
10
9## 2.65 11## 2.65
10 12
11Added a new user option to disable automatic follow confirmations (follow requests must be manually approved from the people page). 13Added a new user option to disable automatic follow confirmations (follow requests must be manually approved from the people page).
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
2576 html_button("limit", L("Limit"), 2576 html_button("limit", L("Limit"),
2577 L("Block announces (boosts) from this user"))); 2577 L("Block announces (boosts) from this user")));
2578 } 2578 }
2579 else
2580 if (pending_check(snac, actor_id)) {
2581 xs_html_add(form,
2582 html_button("approve", L("Approve"),
2583 L("Approve this follow request")));
2584
2585 xs_html_add(form,
2586 html_button("discard", L("Discard"), L("Discard this follow request")));
2587 }
2588 else { 2579 else {
2589 xs_html_add(form, 2580 xs_html_add(form,
2590 html_button("follow", L("Follow"), 2581 html_button("follow", L("Follow"),
@@ -2595,6 +2586,15 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t, cons
2595 html_button("delete", L("Delete"), L("Delete this user"))); 2586 html_button("delete", L("Delete"), L("Delete this user")));
2596 } 2587 }
2597 2588
2589 if (pending_check(snac, actor_id)) {
2590 xs_html_add(form,
2591 html_button("approve", L("Approve"),
2592 L("Approve this follow request")));
2593
2594 xs_html_add(form,
2595 html_button("discard", L("Discard"), L("Discard this follow request")));
2596 }
2597
2598 if (is_muted(snac, actor_id)) 2598 if (is_muted(snac, actor_id))
2599 xs_html_add(form, 2599 xs_html_add(form,
2600 html_button("unmute", L("Unmute"), 2600 html_button("unmute", L("Unmute"),
diff --git a/snac.h b/snac.h
index 70b7828..583610d 100644
--- a/snac.h
+++ b/snac.h
@@ -1,7 +1,7 @@
1/* snac - A simple, minimalistic ActivityPub instance */ 1/* snac - A simple, minimalistic ActivityPub instance */
2/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */ 2/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
3 3
4#define VERSION "2.66-dev" 4#define VERSION "2.66"
5 5
6#define USER_AGENT "snac/" VERSION 6#define USER_AGENT "snac/" VERSION
7 7