Merge branch 'master' into build-with-musl

RELEASE_NOTES.md

@@ -1,11 +1,13 @@
 # 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.
 
 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).

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"),

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
 

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",