commit af98f4e

shtrophic  ·  2024-12-19 19:04:42 +0000 UTC
parents f625b7f, 7808d70
Merge tag '2.66'

Version 2.66 RELEASED.
3 files changed,  +13, -11
M html.c
M snac.h
+3, -1
 1@@ -1,11 +1,13 @@
 2 # Release Notes
 3 
 4-## UNRELEASED
 5+## 2.66
 6 
 7 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.
 8 
 9 Some fixes to blocked instances code (posts from them were sometimes shown).
10 
11+Fixed non-appearing buttons `Approve` and `Discard` if the account requesting a follow were being followed.
12+
13 ## 2.65
14 
15 Added a new user option to disable automatic follow confirmations (follow requests must be manually approved from the people page).
M html.c
+9, -9
 1@@ -2576,15 +2576,6 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t, cons
 2                         html_button("limit", L("Limit"),
 3                                 L("Block announces (boosts) from this user")));
 4             }
 5-            else
 6-            if (pending_check(snac, actor_id)) {
 7-                xs_html_add(form,
 8-                    html_button("approve", L("Approve"),
 9-                                L("Approve this follow request")));
10-
11-                xs_html_add(form,
12-                    html_button("discard", L("Discard"), L("Discard this follow request")));
13-            }
14             else {
15                 xs_html_add(form,
16                     html_button("follow", L("Follow"),
17@@ -2595,6 +2586,15 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t, cons
18                         html_button("delete", L("Delete"), L("Delete this user")));
19             }
20 
21+            if (pending_check(snac, actor_id)) {
22+                xs_html_add(form,
23+                    html_button("approve", L("Approve"),
24+                                L("Approve this follow request")));
25+
26+                xs_html_add(form,
27+                    html_button("discard", L("Discard"), L("Discard this follow request")));
28+            }
29+
30             if (is_muted(snac, actor_id))
31                 xs_html_add(form,
32                     html_button("unmute", L("Unmute"),
M snac.h
+1, -1
1@@ -1,7 +1,7 @@
2 /* snac - A simple, minimalistic ActivityPub instance */
3 /* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
4 
5-#define VERSION "2.66-dev"
6+#define VERSION "2.66"
7 
8 #define USER_AGENT "snac/" VERSION
9