monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-12-26 01:03:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into build-with-musl

Browse source
This commit is contained in:
Giacomo Tesio 2024-12-09 15:23:53 +01:00
commit 4ea42930b3
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
RELEASE_NOTES.md
View file

@ -1,11 +1,13 @@
# Release Notes # 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. 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). 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 ## 2.65
Added a new user option to disable automatic follow confirmations (follow requests must be manually approved from the people page). Added a new user option to disable automatic follow confirmations (follow requests must be manually approved from the people page).

18
html.c
View file

@ -2576,15 +2576,6 @@ xs_html *html_people_list(snac *snac, xs_list *list, char *header, char *t, cons
html_button("limit", L("Limit"), html_button("limit", L("Limit"),
L("Block announces (boosts) from this user"))); 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 { else {
xs_html_add(form, xs_html_add(form,
html_button("follow", L("Follow"), 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"))); 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)) if (is_muted(snac, actor_id))
xs_html_add(form, xs_html_add(form,
html_button("unmute", L("Unmute"), html_button("unmute", L("Unmute"),

2
snac.h
View file

@ -1,7 +1,7 @@
/* snac - A simple, minimalistic ActivityPub instance */ /* snac - A simple, minimalistic ActivityPub instance */
/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */ /* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
#define VERSION "2.66-dev" #define VERSION "2.66"
#define USER_AGENT "snac/" VERSION #define USER_AGENT "snac/" VERSION

3
xs_mime.h
View file

@ -11,11 +11,12 @@ extern const char *xs_mime_types[];
#ifdef XS_IMPLEMENTATION #ifdef XS_IMPLEMENTATION
/* intentionally brain-dead simple */ /* intentionally brain-dead simple */
/* CAUTION: sorted */ /* CAUTION: sorted by extension */
const char *xs_mime_types[] = { const char *xs_mime_types[] = {
"3gp", "video/3gpp", "3gp", "video/3gpp",
"aac", "audio/aac", "aac", "audio/aac",
"avif", "image/avif",
"css", "text/css", "css", "text/css",
"flac", "audio/flac", "flac", "audio/flac",
"flv", "video/flv", "flv", "video/flv",