5 files changed, 48 insertions, 13 deletions

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index a8f04e8..3463b38 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,6 +1,12 @@
 # Release Notes
 
-## 2.74
+## UNRELEASED
+
+Mastodon API: added support for `/api/v1/instance/peers`.
+
+Some Czech and Russian translation fixes.
+
+## 2.74 "The Days of Nicole, the Fediverse Chick"
 
 Added Spanish (default, Argentina and Uruguay) translation (contributed by gnemmi).
 
@@ -22,7 +28,7 @@ Added Greek translation (contributed by uhuru).
 
 Added Italian translation (contributed by anzu).
 
-Mastodon API: added support for /api/v1/custom_emojis (contributed by violette).
+Mastodon API: added support for `/api/v1/custom_emojis` (contributed by violette).
 
 Improved Undo+Follow logic (contributed by rozenglass).
 
diff --git a/TODO.md b/TODO.md
index bdb860c..baa910a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,16 +6,12 @@ Investigate the problem with boosts inside the same instance (see https://codebe
 
 Editing / Updating a post does not index newly added hashtags.
 
-Wrong level of message visibility when using the Mastodon API: https://codeberg.org/grunfink/snac2/issues/200#issuecomment-2351042
-
 Unfollowing guppe groups seems to work (http status of 200), but messages continue to arrive as if it didn't.
 
 Important: deleting a follower should do more that just delete the object, see https://codeberg.org/grunfink/snac2/issues/43#issuecomment-956721
 
 ## Wishlist
 
-Each notification should show a link to the full thread, to see it in context.
-
 The instance timeline should also show boosts from users.
 
 Mastoapi: implement /v1/conversations.
@@ -30,14 +26,10 @@ Integrate "Added handling for International Domain Names" PR https://codeberg.or
 
 Do something about Akkoma and Misskey's quoted replies (they use the `quoteUrl` field instead of `inReplyTo`).
 
-Add a list of hashtags to drop.
-
 Take a look at crashes in the brittle Mastodon official app (crashes when hitting the reply button, crashes or 'ownVotes is null' errors when trying to show polls).
 
 The 'history' pages are just monthly HTML snapshots of the local timeline. This is ok and cheap and easy, but is problematic if you e.g. intentionally delete a post because it will remain there in the history forever. If you activate local timeline purging, purged entries will remain in the history as 'ghosts', which may or may not be what the user wants.
 
-The actual storage system wastes too much disk space (lots of small files that really consume 4k of storage). Consider alternatives.
-
 ## Closed
 
 Start a TODO file (2022-08-25T10:07:44+0200).
@@ -367,3 +359,11 @@ Add support for /authorize_interaction (whatever it is) (2025-01-16T14:45:28+010
 Implement following of hashtags (this is not trivial) (2025-01-30T16:12:16+0100).
 
 Add support for subscribing and posting to relays (see https://codeberg.org/grunfink/snac2/issues/216 for more information) (2025-01-30T16:12:34+0100).
+
+Wrong level of message visibility when using the Mastodon API: https://codeberg.org/grunfink/snac2/issues/200#issuecomment-2351042 (2025-03-23T15:44:35+0100).
+
+Each notification should show a link to the full thread, to see it in context (2025-03-23T15:44:50+0100).
+
+Add a list of hashtags to drop (2025-03-23T15:45:30+0100).
+
+The actual storage system wastes too much disk space (lots of small files that really consume 4k of storage). Consider alternatives (2025-03-23T15:46:02+0100).
diff --git a/data.c b/data.c
index ce040dd..a192830 100644
--- a/data.c
+++ b/data.c
@@ -2619,10 +2619,9 @@ xs_list *inbox_list(void)
     xs_list *ibl = xs_list_new();
     xs *spec     = xs_fmt("%s/inbox/" "*", srv_basedir);
     xs *files    = xs_glob(spec, 0, 0);
-    xs_list *p   = files;
     const xs_val *v;
 
-    while (xs_list_iter(&p, &v)) {
+    xs_list_foreach(files, v) {
         FILE *f;
 
         if ((f = fopen(v, "r")) != NULL) {
@@ -2630,7 +2629,9 @@ xs_list *inbox_list(void)
 
             if (line && *line) {
                 line = xs_strip_i(line);
-                ibl  = xs_list_append(ibl, line);
+
+                if (!is_instance_blocked(line))
+                    ibl = xs_list_append(ibl, line);
             }
 
             fclose(f);
diff --git a/html.c b/html.c
index 3d8f0e1..d549f75 100644
--- a/html.c
+++ b/html.c
@@ -72,6 +72,9 @@ xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems, const char *p
         const xs_dict *v;
         int c = 0;
 
+        xs_set rep_emoji;
+        xs_set_init(&rep_emoji);
+
         while (xs_list_next(tag_list, &v, &c)) {
             const char *t = xs_dict_get(v, "type");
 
@@ -79,6 +82,10 @@ xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems, const char *p
                 const char *n = xs_dict_get(v, "name");
                 const xs_dict *i = xs_dict_get(v, "icon");
 
+                /* avoid repeated emojis (Misskey seems to return this) */
+                if (xs_set_add(&rep_emoji, n) == 0)
+                    continue;
+
                 if (xs_is_string(n) && xs_is_dict(i)) {
                     const char *u = xs_dict_get(i, "url");
                     const char *mt = xs_dict_get(i, "mediaType");
@@ -106,6 +113,8 @@ xs_str *replace_shortnames(xs_str *s, const xs_list *tag, int ems, const char *p
                 }
             }
         }
+
+        xs_set_free(&rep_emoji);
     }
 
     return s;
diff --git a/mastoapi.c b/mastoapi.c
index 8d61681..7b1e0ad 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -2256,6 +2256,25 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
         status = HTTP_STATUS_OK;
     }
     else
+    if (strcmp(cmd, "/v1/instance/peers") == 0) { /** **/
+        /* get the collected inbox list as the instances "this domain is aware of" */
+        xs *list = inbox_list();
+        xs *peers = xs_list_new();
+        const char *inbox;
+
+        xs_list_foreach(list, inbox) {
+            xs *l = xs_split(inbox, "/");
+            const char *domain = xs_list_get(l, 2);
+
+            if (xs_is_string(domain))
+                peers = xs_list_append(peers, domain);
+        }
+
+        *body  = xs_json_dumps(peers, 4);
+        *ctype = "application/json";
+        status = HTTP_STATUS_OK;
+    }
+    else
     if (xs_startswith(cmd, "/v1/statuses/")) { /** **/
         /* information about a status */
         if (logged_in) {