1 files changed, 53 insertions, 7 deletions
diff --git a/mastoapi.c b/mastoapi.c
index c9d71b9..990898b 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -171,7 +171,7 @@ const char *login_page = ""
 "<body><h1>%s OAuth identify</h1>\n"
 "<div style=\"background-color: red; color: white\">%s</div>\n"
 "<form method=\"post\" action=\"%s:/" "/%s/%s\">\n"
-"<p>Login: <input type=\"text\" name=\"login\"></p>\n"
+"<p>Login: <input type=\"text\" name=\"login\" autocapitalize=\"off\"></p>\n"
 "<p>Password: <input type=\"password\" name=\"passwd\"></p>\n"
 "<input type=\"hidden\" name=\"redir\" value=\"%s\">\n"
 "<input type=\"hidden\" name=\"cid\" value=\"%s\">\n"
@@ -663,6 +663,17 @@ xs_dict *mastoapi_account(snac *logged, const xs_dict *actor)
        if (user_open(&user, prefu)) {
            val_links = user.links;
            metadata  = xs_dict_get_def(user.config, "metadata", xs_stock(XSTYPE_DICT));
+            /* does this user want to publish their contact metrics? */
+            if (xs_is_true(xs_dict_get(user.config, "show_contact_metrics"))) {
+                xs *fwing = following_list(&user);
+                xs *fwers = follower_list(&user);
+                xs *ni = xs_number_new(xs_list_len(fwing));
+                xs *ne = xs_number_new(xs_list_len(fwers));
+                acct = xs_dict_append(acct, "followers_count", ne);
+                acct = xs_dict_append(acct, "following_count", ni);
+            }
        }
    }
@@ -827,7 +838,16 @@ xs_dict *mastoapi_status(snac *snac, const xs_dict *msg)
    st = xs_dict_append(st, "url",          id);
    st = xs_dict_append(st, "account",      acct);
-    xs *fd = mastoapi_date(xs_dict_get(msg, "published"));
+    const char *published = xs_dict_get(msg, "published");
+    xs *fd = NULL;
+    if (published)
+        fd = mastoapi_date(published);
+    else {
+        xs *p = xs_str_iso_date(0);
+        fd = mastoapi_date(p);
+    }
    st = xs_dict_append(st, "created_at", fd);
    {
@@ -1024,7 +1044,7 @@ xs_dict *mastoapi_status(snac *snac, const xs_dict *msg)
    st = xs_dict_append(st, "in_reply_to_id",         xs_stock(XSTYPE_NULL));
    st = xs_dict_append(st, "in_reply_to_account_id", xs_stock(XSTYPE_NULL));
-    tmp = xs_dict_get(msg, "inReplyTo");
+    tmp = get_in_reply_to(msg);
    if (!xs_is_null(tmp)) {
        xs *irto = NULL;
@@ -1266,6 +1286,17 @@ void credentials_get(char **body, char **ctype, int *status, snac snac)
    acct = xs_dict_append(acct, "following_count", xs_stock(0));
    acct = xs_dict_append(acct, "statuses_count", xs_stock(0));
+    /* does this user want to publish their contact metrics? */
+    if (xs_is_true(xs_dict_get(snac.config, "show_contact_metrics"))) {
+        xs *fwing = following_list(&snac);
+        xs *fwers = follower_list(&snac);
+        xs *ni = xs_number_new(xs_list_len(fwing));
+        xs *ne = xs_number_new(xs_list_len(fwers));
+        acct = xs_dict_append(acct, "followers_count", ne);
+        acct = xs_dict_append(acct, "following_count", ni);
+    }
    *body = xs_json_dumps(acct, 4);
    *ctype = "application/json";
    *status = HTTP_STATUS_OK;
@@ -1340,6 +1371,9 @@ xs_list *mastoapi_timeline(snac *user, const xs_dict *args, const char *index_fn
            if (!xs_match(type, POSTLIKE_OBJECT_TYPE))
                continue;
+            if (id && is_instance_blocked(id))
+                continue;
            const char *from = NULL;
            if (strcmp(type, "Page") == 0)
                from = xs_dict_get(msg, "audience");
@@ -1727,11 +1761,11 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
        if (logged_in) {
            xs *l      = notify_list(&snac1, 0, 64);
            xs *out    = xs_list_new();
-            xs_list *p = l;
            const xs_dict *v;
            const xs_list *excl = xs_dict_get(args, "exclude_types[]");
+            const char *max_id = xs_dict_get(args, "max_id");
-            while (xs_list_iter(&p, &v)) {
+            xs_list_foreach(l, v) {
                xs *noti = notify_get(&snac1, v);
                if (noti == NULL)
@@ -1740,6 +1774,8 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
                const char *type  = xs_dict_get(noti, "type");
                const char *utype = xs_dict_get(noti, "utype");
                const char *objid = xs_dict_get(noti, "objid");
+                const char *id    = xs_dict_get(noti, "id");
+                xs *fid = xs_replace(id, ".", "");
                xs *actor = NULL;
                xs *entry = NULL;
@@ -1752,6 +1788,13 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
                if (is_hidden(&snac1, objid))
                    continue;
+                if (max_id) {
+                    if (strcmp(fid, max_id) == 0)
+                        max_id = NULL;
+                    continue;
+                }
                /* convert the type */
                if (strcmp(type, "Like") == 0 || strcmp(type, "EmojiReact") == 0)
                    type = "favourite";
@@ -1778,12 +1821,15 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
                mn = xs_dict_append(mn, "type", type);
-                xs *id = xs_replace(xs_dict_get(noti, "id"), ".", "");
+                mn = xs_dict_append(mn, "id", fid);
-                mn = xs_dict_append(mn, "id", id);
                mn = xs_dict_append(mn, "created_at", xs_dict_get(noti, "date"));
                xs *acct = mastoapi_account(&snac1, actor);
+                if (acct == NULL)
+                    continue;
                mn = xs_dict_append(mn, "account", acct);
                if (strcmp(type, "follow") != 0 && !xs_is_null(objid)) {