diff options
| author | 2024-12-04 05:51:17 +0100 | |
|---|---|---|
| committer | 2024-12-04 05:51:17 +0100 | |
| commit | 203db3b09e3ebf8677f75e83e5470b99c74de470 (patch) | |
| tree | 661c07f5529eb563f7d3e7775a10a5b0973476c9 | |
| parent | Version 2.65 RELEASED. (diff) | |
| download | penes-snac2-203db3b09e3ebf8677f75e83e5470b99c74de470.tar.gz penes-snac2-203db3b09e3ebf8677f75e83e5470b99c74de470.tar.xz penes-snac2-203db3b09e3ebf8677f75e83e5470b99c74de470.zip | |
Fixed bug in blocked instance rejection.
| -rw-r--r-- | html.c | 3 | ||||
| -rw-r--r-- | mastoapi.c | 3 | ||||
| -rw-r--r-- | snac.h | 2 |
3 files changed, 7 insertions, 1 deletions
| @@ -1524,6 +1524,9 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only, | |||
| 1524 | if ((read_only || !user) && !is_msg_public(msg)) | 1524 | if ((read_only || !user) && !is_msg_public(msg)) |
| 1525 | return NULL; | 1525 | return NULL; |
| 1526 | 1526 | ||
| 1527 | if (is_instance_blocked(id)) | ||
| 1528 | return NULL; | ||
| 1529 | |||
| 1527 | if (user && level == 0 && xs_is_true(xs_dict_get(user->config, "collapse_threads"))) | 1530 | if (user && level == 0 && xs_is_true(xs_dict_get(user->config, "collapse_threads"))) |
| 1528 | collapse_threads = 1; | 1531 | collapse_threads = 1; |
| 1529 | 1532 | ||
| @@ -1349,6 +1349,9 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index_fn | |||
| 1349 | if (!xs_match(type, POSTLIKE_OBJECT_TYPE)) | 1349 | if (!xs_match(type, POSTLIKE_OBJECT_TYPE)) |
| 1350 | continue; | 1350 | continue; |
| 1351 | 1351 | ||
| 1352 | if (is_instance_blocked(id)) | ||
| 1353 | continue; | ||
| 1354 | |||
| 1352 | const char *from = NULL; | 1355 | const char *from = NULL; |
| 1353 | if (strcmp(type, "Page") == 0) | 1356 | if (strcmp(type, "Page") == 0) |
| 1354 | from = xs_dict_get(msg, "audience"); | 1357 | from = xs_dict_get(msg, "audience"); |
| @@ -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.65" | 4 | #define VERSION "2.66-dev" |
| 5 | 5 | ||
| 6 | #define USER_AGENT "snac/" VERSION | 6 | #define USER_AGENT "snac/" VERSION |
| 7 | 7 | ||