From 64f2d3d746d8536c460b88fc852fdca01c5c813c Mon Sep 17 00:00:00 2001
From: default <nobody@localhost>
Date: Tue, 7 Jan 2025 08:08:51 +0100
Subject: Minor semantic tweak.

---
 snac.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'snac.h')

diff --git a/snac.h b/snac.h
index ec3ee5c..75db4a9 100644
--- a/snac.h
+++ b/snac.h
@@ -317,7 +317,7 @@ xs_dict *msg_follow(snac *snac, const char *actor);
 
 xs_dict *msg_note(snac *snac, const xs_str *content, const xs_val *rcpts,
                   const xs_str *in_reply_to, const xs_list *attach,
-                  int priv, const char *lang);
+                  int scope, const char *lang);
 
 xs_dict *msg_undo(snac *snac, const xs_val *object);
 xs_dict *msg_delete(snac *snac, const char *id);
-- 
cgit 


From 1039c2dff51173b46278c6b89555af7b273a9eae Mon Sep 17 00:00:00 2001
From: default <nobody@localhost>
Date: Tue, 7 Jan 2025 10:20:07 +0100
Subject: Version 2.68 RELEASED.

---
 snac.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'snac.h')

diff --git a/snac.h b/snac.h
index 75db4a9..5ee0390 100644
--- a/snac.h
+++ b/snac.h
@@ -1,7 +1,7 @@
 /* snac - A simple, minimalistic ActivityPub instance */
 /* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
 
-#define VERSION "2.68-dev"
+#define VERSION "2.68"
 
 #define USER_AGENT "snac/" VERSION
 
-- 
cgit 


From 932227bbac7fe740bff1e38bf92b58edef19e32f Mon Sep 17 00:00:00 2001
From: default <nobody@localhost>
Date: Wed, 8 Jan 2025 16:59:14 +0100
Subject: Bumped copyright year.

---
 LICENSE          |  2 +-
 activitypub.c    |  2 +-
 data.c           |  2 +-
 format.c         |  2 +-
 html.c           |  2 +-
 http.c           |  2 +-
 httpd.c          |  2 +-
 main.c           |  4 ++--
 mastoapi.c       |  2 +-
 snac.c           |  2 +-
 snac.h           |  2 +-
 upgrade.c        |  2 +-
 utils.c          |  2 +-
 webfinger.c      |  2 +-
 xs.h             |  2 +-
 xs_curl.h        |  2 +-
 xs_fcgi.h        |  2 +-
 xs_glob.h        |  2 +-
 xs_hex.h         |  2 +-
 xs_html.h        |  2 +-
 xs_httpd.h       |  2 +-
 xs_io.h          |  2 +-
 xs_json.h        |  2 +-
 xs_match.h       |  2 +-
 xs_mime.h        |  2 +-
 xs_openssl.h     |  2 +-
 xs_random.h      |  2 +-
 xs_regex.h       |  2 +-
 xs_set.h         |  2 +-
 xs_socket.h      |  2 +-
 xs_time.h        |  2 +-
 xs_unicode.h     |  2 +-
 xs_unix_socket.h |  2 +-
 xs_url.h         | 25 ++++++++++++++++++++++++-
 xs_version.h     |  2 +-
 35 files changed, 59 insertions(+), 36 deletions(-)

(limited to 'snac.h')

diff --git a/LICENSE b/LICENSE
index cdb4e0b..702b487 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 - 2024 grunfink et al. (Fediverse: @grunfink@comam.es)
+Copyright (c) 2022 - 2025 grunfink et al. (Fediverse: @grunfink@comam.es)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/activitypub.c b/activitypub.c
index fe3fd41..24954e6 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_json.h"
diff --git a/data.c b/data.c
index 0fd3528..576bc40 100644
--- a/data.c
+++ b/data.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_hex.h"
diff --git a/format.c b/format.c
index 41e4162..52ed3ec 100644
--- a/format.c
+++ b/format.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_regex.h"
diff --git a/html.c b/html.c
index d1844c2..5a62d16 100644
--- a/html.c
+++ b/html.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/http.c b/http.c
index b21f1dc..611de4f 100644
--- a/http.c
+++ b/http.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/httpd.c b/httpd.c
index 163f98a..dda40b9 100644
--- a/httpd.c
+++ b/httpd.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/main.c b/main.c
index 7d23c84..5b1dd61 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
@@ -14,7 +14,7 @@
 int usage(void)
 {
     printf("snac " VERSION " - A simple, minimalistic ActivityPub instance\n");
-    printf("Copyright (c) 2022 - 2024 grunfink et al. / MIT license\n");
+    printf("Copyright (c) 2022 - 2025 grunfink et al. / MIT license\n");
     printf("\n");
     printf("Commands:\n");
     printf("\n");
diff --git a/mastoapi.c b/mastoapi.c
index 62108ad..4b89d12 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef NO_MASTODON_API
 
diff --git a/snac.c b/snac.c
index 1ce563b..80c7349 100644
--- a/snac.c
+++ b/snac.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #define XS_IMPLEMENTATION
 
diff --git a/snac.h b/snac.h
index 5ee0390..23ec93a 100644
--- a/snac.h
+++ b/snac.h
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #define VERSION "2.68"
 
diff --git a/upgrade.c b/upgrade.c
index 847c62e..87ddfc8 100644
--- a/upgrade.c
+++ b/upgrade.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/utils.c b/utils.c
index 0740d4d..336ae2d 100644
--- a/utils.c
+++ b/utils.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_io.h"
diff --git a/webfinger.c b/webfinger.c
index 85123bc..5db9a97 100644
--- a/webfinger.c
+++ b/webfinger.c
@@ -1,5 +1,5 @@
 /* snac - A simple, minimalistic ActivityPub instance */
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #include "xs.h"
 #include "xs_json.h"
diff --git a/xs.h b/xs.h
index 39b3b64..a6e40d5 100644
--- a/xs.h
+++ b/xs.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_H
 
diff --git a/xs_curl.h b/xs_curl.h
index 9b4c229..f0cfd98 100644
--- a/xs_curl.h
+++ b/xs_curl.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_CURL_H
 
diff --git a/xs_fcgi.h b/xs_fcgi.h
index c6ffe1f..870e3e8 100644
--- a/xs_fcgi.h
+++ b/xs_fcgi.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 /*
     This is an intentionally-dead-simple FastCGI implementation;
diff --git a/xs_glob.h b/xs_glob.h
index 15cb49a..6d87ca1 100644
--- a/xs_glob.h
+++ b/xs_glob.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_GLOB_H
 
diff --git a/xs_hex.h b/xs_hex.h
index 745ac93..2507d5d 100644
--- a/xs_hex.h
+++ b/xs_hex.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_HEX_H
 
diff --git a/xs_html.h b/xs_html.h
index a95d45a..8331f93 100644
--- a/xs_html.h
+++ b/xs_html.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_HTML_H
 
diff --git a/xs_httpd.h b/xs_httpd.h
index 860ae05..cf0d811 100644
--- a/xs_httpd.h
+++ b/xs_httpd.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_HTTPD_H
 
diff --git a/xs_io.h b/xs_io.h
index f63ae5b..110b0eb 100644
--- a/xs_io.h
+++ b/xs_io.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_IO_H
 
diff --git a/xs_json.h b/xs_json.h
index 69249b1..660c277 100644
--- a/xs_json.h
+++ b/xs_json.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_JSON_H
 
diff --git a/xs_match.h b/xs_match.h
index 668429a..0b89ac8 100644
--- a/xs_match.h
+++ b/xs_match.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_MATCH_H
 
diff --git a/xs_mime.h b/xs_mime.h
index 5c0a6fd..6f65382 100644
--- a/xs_mime.h
+++ b/xs_mime.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_MIME_H
 
diff --git a/xs_openssl.h b/xs_openssl.h
index f339ac6..9388691 100644
--- a/xs_openssl.h
+++ b/xs_openssl.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_OPENSSL_H
 
diff --git a/xs_random.h b/xs_random.h
index 78de32a..f936099 100644
--- a/xs_random.h
+++ b/xs_random.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_RANDOM_H
 
diff --git a/xs_regex.h b/xs_regex.h
index 3ba504b..a4db447 100644
--- a/xs_regex.h
+++ b/xs_regex.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_REGEX_H
 
diff --git a/xs_set.h b/xs_set.h
index f6b65aa..3eaefdf 100644
--- a/xs_set.h
+++ b/xs_set.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_SET_H
 
diff --git a/xs_socket.h b/xs_socket.h
index fb67b9d..6e618ba 100644
--- a/xs_socket.h
+++ b/xs_socket.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_SOCKET_H
 
diff --git a/xs_time.h b/xs_time.h
index 1df2fef..0e004dc 100644
--- a/xs_time.h
+++ b/xs_time.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_TIME_H
 
diff --git a/xs_unicode.h b/xs_unicode.h
index cfcd8ff..ef18fea 100644
--- a/xs_unicode.h
+++ b/xs_unicode.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_UNICODE_H
 
diff --git a/xs_unix_socket.h b/xs_unix_socket.h
index 3eb2307..462a5b3 100644
--- a/xs_unix_socket.h
+++ b/xs_unix_socket.h
@@ -1,4 +1,4 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_UNIX_SOCKET_H
 
diff --git a/xs_url.h b/xs_url.h
index ac43585..3c24736 100644
--- a/xs_url.h
+++ b/xs_url.h
@@ -1,10 +1,11 @@
-/* copyright (c) 2022 - 2024 grunfink et al. / MIT license */
+/* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
 #ifndef _XS_URL_H
 
 #define _XS_URL_H
 
 xs_str *xs_url_dec(const char *str);
+xs_str *xs_url_enc(const char *str);
 xs_dict *xs_url_vars(const char *str);
 xs_dict *xs_multipart_form_data(const char *payload, int p_size, const char *header);
 
@@ -39,6 +40,28 @@ xs_str *xs_url_dec(const char *str)
 }
 
 
+xs_str *xs_url_enc(const char *str)
+/* URL-encodes a string (RFC 3986) */
+{
+    xs_str *s = xs_str_new(NULL);
+
+    while (*str) {
+        if (isalnum(*str) || strchr("-._~", *str)) {
+            s = xs_append_m(s, str, 1);
+        }
+        else {
+            char tmp[8];
+            snprintf(tmp, sizeof(tmp), "%%%02X", (unsigned char)*str);
+            s = xs_append_m(s, tmp, 3);
+        }
+
+        str++;
+    }
+
+    return s;
+}
+
+
 xs_dict *xs_url_vars(const char *str)
 /* parse url variables */
 {
diff --git a/xs_version.h b/xs_version.h
index 770366a..fc3b755 100644
--- a/xs_version.h
+++ b/xs_version.h
@@ -1 +1 @@
-/* 297f71e198be7819213e9122e1e78c3b963111bc 2024-11-24T18:48:42+01:00 */
+/* 9e8f5cf300ffbf453031f2ec923cef0822a41b41 2025-01-08T16:57:26+01:00 */
-- 
cgit 


From 41cb63c936e1520def842f381334397a572bc1cd Mon Sep 17 00:00:00 2001
From: default <nobody@localhost>
Date: Thu, 9 Jan 2025 19:21:06 +0100
Subject: Added some actor object caching.

---
 activitypub.c | 16 +++++++++++++++-
 data.c        |  4 ++++
 snac.h        |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'snac.h')

diff --git a/activitypub.c b/activitypub.c
index 81f7708..6f3aefb 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -1194,10 +1194,20 @@ xs_dict *msg_actor(snac *snac)
     xs *avtr     = NULL;
     xs *kid      = NULL;
     xs *f_bio    = NULL;
-    xs_dict *msg = msg_base(snac, "Person", snac->actor, NULL, NULL, NULL);
+    xs_dict *msg = NULL;
     const char *p;
     int n;
 
+    /* everybody loves some caching */
+    if (time(NULL) - object_mtime(snac->actor) < 6 * 3600 &&
+        valid_status(object_get(snac->actor, &msg))) {
+        snac_debug(snac, 1, xs_fmt("Returning cached actor %s", snac->actor));
+
+        return msg;
+    }
+
+    msg = msg_base(snac, "Person", snac->actor, NULL, NULL, NULL);
+
     /* change the @context (is this really necessary?) */
     ctxt = xs_list_append(ctxt, "https:/" "/www.w3.org/ns/activitystreams");
     ctxt = xs_list_append(ctxt, "https:/" "/w3id.org/security/v1");
@@ -1330,6 +1340,10 @@ xs_dict *msg_actor(snac *snac)
     msg = xs_dict_set(msg, "manuallyApprovesFollowers",
         xs_stock(xs_is_true(manually) ? XSTYPE_TRUE : XSTYPE_FALSE));
 
+    /* cache it */
+    snac_debug(snac, 1, xs_fmt("Caching actor %s", snac->actor));
+    object_add_ow(snac->actor, msg);
+
     return msg;
 }
 
diff --git a/data.c b/data.c
index 576bc40..3463727 100644
--- a/data.c
+++ b/data.c
@@ -336,6 +336,10 @@ int user_persist(snac *snac, int publish)
 
                 if (!nw)
                     publish = 0;
+                else {
+                    /* uncache the actor object */
+                    object_del(snac->actor);
+                }
             }
         }
     }
diff --git a/snac.h b/snac.h
index 23ec93a..5729a22 100644
--- a/snac.h
+++ b/snac.h
@@ -1,7 +1,7 @@
 /* snac - A simple, minimalistic ActivityPub instance */
 /* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
-#define VERSION "2.68"
+#define VERSION "2.69-dev"
 
 #define USER_AGENT "snac/" VERSION
 
-- 
cgit 


From b5c5c5cb9e1c728a83596dcc7c4191d012fe1332 Mon Sep 17 00:00:00 2001
From: Paul Martin <pm@nowster.org.uk>
Date: Wed, 15 Jan 2025 00:40:32 +0000
Subject: Implement faster min_id handling

---
 data.c     | 31 +++++++++++++++++++++++++++++++
 mastoapi.c | 46 ++++++++++++++++++++++++++++------------------
 snac.h     |  2 ++
 3 files changed, 61 insertions(+), 18 deletions(-)

(limited to 'snac.h')

diff --git a/data.c b/data.c
index ca63084..33947ff 100644
--- a/data.c
+++ b/data.c
@@ -679,6 +679,37 @@ int index_desc_first(FILE *f, char md5[MD5_HEX_SIZE], int skip)
     return 1;
 }
 
+int index_asc_first(FILE *f,char md5[MD5_HEX_SIZE], const char *seek_md5)
+/* reads the first entry of an ascending index, starting from a given md5 */
+{
+    fseek(f, SEEK_SET, 0);
+    while (fread(md5, MD5_HEX_SIZE, 1, f)) {
+        md5[MD5_HEX_SIZE - 1] = '\0';
+        if (strcmp(md5,seek_md5) == 0) {
+            return index_asc_next(f, md5);
+        }
+    }
+    return 0;
+}
+
+int index_asc_next(FILE *f, char md5[MD5_HEX_SIZE])
+/* reads the next entry of an ascending index */
+{
+    for (;;) {
+        /* read an md5 */
+        if (!fread(md5, MD5_HEX_SIZE, 1, f))
+            return 0;
+
+        /* deleted, skip */
+        if (md5[0] != '-')
+            break;
+    }
+
+    md5[MD5_HEX_SIZE - 1] = '\0';
+
+    return 1;
+}
+
 
 xs_list *index_list_desc(const char *fn, int skip, int show)
 /* returns an index as a list, in reverse order */
diff --git a/mastoapi.c b/mastoapi.c
index 21e2a78..c25f78b 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -1339,6 +1339,9 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index_fn
     const char *since_id = xs_dict_get(args, "since_id");
     const char *min_id   = xs_dict_get(args, "min_id"); /* unsupported old-to-new navigation */
     const char *limit_s  = xs_dict_get(args, "limit");
+    int (*iterator)(FILE *, char *);
+    int initial_status = 0;
+    int ascending = 0;
     int limit = 0;
     int cnt   = 0;
 
@@ -1348,27 +1351,40 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index_fn
     if (limit == 0)
         limit = 20;
 
-    if (index_desc_first(f, md5, 0)) {
+    if (min_id) {
+        iterator = &index_asc_next;
+        initial_status = index_asc_first(f, md5, MID_TO_MD5(min_id));
+        ascending = 1;
+    }
+    else {
+        iterator = &index_desc_next;
+        initial_status = index_desc_first(f, md5, 0);
+    }
+
+    if (initial_status) {
         do {
             xs *msg = NULL;
 
             /* only return entries older that max_id */
             if (max_id) {
-                if (strcmp(md5, MID_TO_MD5(max_id)) == 0)
+                if (strcmp(md5, MID_TO_MD5(max_id)) == 0) {
                     max_id = NULL;
-
-                continue;
+                    if (ascending)
+                        break;
+                }
+                if (!ascending)
+                    continue;
             }
 
             /* only returns entries newer than since_id */
             if (since_id) {
-                if (strcmp(md5, MID_TO_MD5(since_id)) == 0)
-                    break;
-            }
-
-            if (min_id) {
-                if (strcmp(md5, MID_TO_MD5(min_id)) == 0)
-                    break;
+                if (strcmp(md5, MID_TO_MD5(since_id)) == 0) {
+                    if (!ascending)
+                        break;
+                    since_id = NULL;
+                }
+                if (ascending)
+                    continue;
             }
 
             /* get the entry */
@@ -1440,14 +1456,8 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index_fn
                 out = xs_list_append(out, st);
                 cnt++;
             }
-            if (min_id) {
-                while (cnt > limit) {
-                    out = xs_list_del(out, 0);
-                    cnt--;
-                }
-            }
 
-        } while ((min_id || (cnt < limit)) && index_desc_next(f, md5));
+        } while ((cnt < limit) && (*iterator)(f, md5));
     }
 
     int more = index_desc_next(f, md5);
diff --git a/snac.h b/snac.h
index 5729a22..65ece5d 100644
--- a/snac.h
+++ b/snac.h
@@ -108,6 +108,8 @@ int index_len(const char *fn);
 xs_list *index_list(const char *fn, int max);
 int index_desc_next(FILE *f, char md5[MD5_HEX_SIZE]);
 int index_desc_first(FILE *f, char md5[MD5_HEX_SIZE], int skip);
+int index_asc_next(FILE *f, char md5[MD5_HEX_SIZE]);
+int index_asc_first(FILE *f, char md5[MD5_HEX_SIZE], const char *seek_md5);
 xs_list *index_list_desc(const char *fn, int skip, int show);
 
 int object_add(const char *id, const xs_dict *obj);
-- 
cgit 


From 1cb7b37ae6adb01444ea1466d8884aacca10ebd8 Mon Sep 17 00:00:00 2001
From: default <nobody@localhost>
Date: Fri, 24 Jan 2025 10:15:17 +0100
Subject: Version 2.69 RELEASED.

---
 snac.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'snac.h')

diff --git a/snac.h b/snac.h
index 65ece5d..c0e512d 100644
--- a/snac.h
+++ b/snac.h
@@ -1,7 +1,7 @@
 /* snac - A simple, minimalistic ActivityPub instance */
 /* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
-#define VERSION "2.69-dev"
+#define VERSION "2.69"
 
 #define USER_AGENT "snac/" VERSION
 
-- 
cgit 


From 71537bdaf8fa3e752b7178efdf53e5c1c1402973 Mon Sep 17 00:00:00 2001
From: default <nobody@localhost>
Date: Sat, 25 Jan 2025 05:29:01 +0100
Subject: Bumped version.

---
 snac.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'snac.h')

diff --git a/snac.h b/snac.h
index c0e512d..344dbaa 100644
--- a/snac.h
+++ b/snac.h
@@ -1,7 +1,7 @@
 /* snac - A simple, minimalistic ActivityPub instance */
 /* copyright (c) 2022 - 2025 grunfink et al. / MIT license */
 
-#define VERSION "2.69"
+#define VERSION "2.70-dev"
 
 #define USER_AGENT "snac/" VERSION
 
-- 
cgit