1 files changed, 16 insertions, 4 deletions

diff --git a/mastoapi.c b/mastoapi.c
index 09e18a1..62108ad 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -1348,7 +1348,7 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index_fn
     if (limit == 0)
         limit = 20;
 
-    if (min_id == NULL && index_desc_first(f, md5, 0)) {
+    if (index_desc_first(f, md5, 0)) {
         do {
             xs *msg = NULL;
 
@@ -1366,6 +1366,11 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index_fn
                     break;
             }
 
+            if (min_id) {
+                if (strcmp(md5, MID_TO_MD5(min_id)) == 0)
+                    break;
+            }
+
             /* get the entry */
             if (user) {
                 if (!valid_status(timeline_get_by_md5(user, md5, &msg)))
@@ -1435,8 +1440,14 @@ 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 (cnt < limit && index_desc_next(f, md5));
+        } while ((min_id || (cnt < limit)) && index_desc_next(f, md5));
     }
 
     int more = index_desc_next(f, md5);
@@ -2589,6 +2600,7 @@ int mastoapi_post_handler(const xs_dict *req, const char *q_path,
             const char *visibility = xs_dict_get(args, "visibility");
             const char *summary    = xs_dict_get(args, "spoiler_text");
             const char *media_ids  = xs_dict_get(args, "media_ids");
+            const char *language   = xs_dict_get(args, "language");
 
             if (xs_is_null(media_ids))
                 media_ids = xs_dict_get(args, "media_ids[]");
@@ -2639,7 +2651,7 @@ int mastoapi_post_handler(const xs_dict *req, const char *q_path,
 
             /* prepare the message */
             xs *msg = msg_note(&snac, content, NULL, irt, attach_list,
-                        strcmp(visibility, "public") == 0 ? 0 : 1);
+                        strcmp(visibility, "public") == 0 ? 0 : 1, language);
 
             if (!xs_is_null(summary) && *summary) {
                 msg = xs_dict_set(msg, "sensitive", xs_stock(XSTYPE_TRUE));
@@ -2989,7 +3001,7 @@ int mastoapi_post_handler(const xs_dict *req, const char *q_path,
                                 if (o) {
                                     const char *name = xs_dict_get(o, "name");
 
-                                    xs *msg = msg_note(&snac, "", atto, (char *)id, NULL, 1);
+                                    xs *msg = msg_note(&snac, "", atto, (char *)id, NULL, 1, NULL);
                                     msg = xs_dict_append(msg, "name", name);
 
                                     xs *c_msg = msg_create(&snac, msg);