6 files changed, 50 insertions, 36 deletions

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 21c2153..484e425 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -4,6 +4,8 @@
 
 The number of pending follow confirmations is shown next to the "people" link.
 
+Faster performance metrics (contributed by dandelions).
+
 Mastodon API: added follow confirmation endpoints.
 
 ## 2.77 "Ugly Links Everywhere"
diff --git a/activitypub.c b/activitypub.c
index a7e133a..120b4a1 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -3204,8 +3204,7 @@ int activitypub_get_handler(const xs_dict *req, const char *q_path,
         int total = 0;
 
         if (show_contact_metrics) {
-            xs *l = follower_list(&snac);
-            total = xs_list_len(l);
+            total = follower_list_len(&snac);
         }
 
         xs *id = xs_fmt("%s/%s", snac.actor, p_path);
@@ -3216,8 +3215,7 @@ int activitypub_get_handler(const xs_dict *req, const char *q_path,
         int total = 0;
 
         if (show_contact_metrics) {
-            xs *l = following_list(&snac);
-            total = xs_list_len(l);
+            total = following_list_len(&snac);
         }
 
         xs *id = xs_fmt("%s/%s", snac.actor, p_path);
diff --git a/data.c b/data.c
index e3fa52d..f9d27f9 100644
--- a/data.c
+++ b/data.c
@@ -1215,6 +1215,14 @@ int follower_check(snac *snac, const char *actor)
 }
 
 
+int follower_list_len(snac *snac)
+/* returns the number of followers */
+{
+    xs *list = object_user_cache_list(snac, "followers", XS_ALL, 0);
+    return xs_list_len(list);
+}
+
+
 xs_list *follower_list(snac *snac)
 /* returns the list of followers */
 {
@@ -1709,6 +1717,15 @@ int following_get(snac *snac, const char *actor, xs_dict **data)
 }
 
 
+int following_list_len(snac *snac)
+/* returns number of people being followed */
+{
+    xs *spec = xs_fmt("%s/following/" "*_a.json", snac->basedir);
+    xs *glist = xs_glob(spec, 0, 0);
+    return xs_list_len(glist);
+}
+
+
 xs_list *following_list(snac *snac)
 /* returns the list of people being followed */
 {
diff --git a/html.c b/html.c
index b27db7a..de2fdce 100644
--- a/html.c
+++ b/html.c
@@ -332,7 +332,8 @@ xs_html *html_actor_icon(snac *user, xs_dict *actor, const char *date,
 }
 
 
-xs_html *html_msg_icon(snac *user, const char *actor_id, const xs_dict *msg, const char *proxy, const char *md5)
+xs_html *html_msg_icon(snac *user, const char *actor_id, const xs_dict *msg,
+                       const char *proxy, const char *md5, const char *lang)
 {
     xs *actor = NULL;
     xs_html *actor_icon = NULL;
@@ -341,7 +342,6 @@ xs_html *html_msg_icon(snac *user, const char *actor_id, const xs_dict *msg, con
         const char *date  = NULL;
         const char *udate = NULL;
         const char *url   = NULL;
-        const char *lang  = NULL;
         int priv    = 0;
         const char *type = xs_dict_get(msg, "type");
 
@@ -353,16 +353,6 @@ xs_html *html_msg_icon(snac *user, const char *actor_id, const xs_dict *msg, con
         date  = xs_dict_get(msg, "published");
         udate = xs_dict_get(msg, "updated");
 
-        lang = xs_dict_get(msg, "contentMap");
-        if (xs_is_dict(lang)) {
-            const char *v;
-            int c = 0;
-
-            xs_dict_next(lang, &lang, &v, &c);
-        }
-        else
-            lang = NULL;
-
         actor_icon = html_actor_icon(user, actor, date, udate, url, priv, 0, proxy, lang, md5);
     }
 
@@ -821,11 +811,7 @@ xs_html *html_user_head(snac *user, const char *desc, const char *url)
 
     /* show metrics in og:description? */
     if (xs_is_true(xs_dict_get(user->config, "show_contact_metrics"))) {
-        xs *fwers = follower_list(user);
-        xs *fwing = following_list(user);
-
-        xs *s1 = xs_fmt(L("%d following, %d followers"),
-            xs_list_len(fwing), xs_list_len(fwers));
+        xs *s1 = xs_fmt(L("%d following, %d followers"), following_list_len(user), follower_list_len(user));
 
         s1 = xs_str_cat(s1, " · ");
 
@@ -1166,11 +1152,7 @@ static xs_html *html_user_body(snac *user, int read_only)
         }
 
         if (xs_is_true(xs_dict_get(user->config, "show_contact_metrics"))) {
-            xs *fwers = follower_list(user);
-            xs *fwing = following_list(user);
-
-            xs *s1 = xs_fmt(L("%d following, %d followers"),
-                xs_list_len(fwing), xs_list_len(fwers));
+            xs *s1 = xs_fmt(L("%d following, %d followers"), following_list_len(user), follower_list_len(user));
 
             xs_html_add(top_user,
                 xs_html_tag("p",
@@ -1951,6 +1933,15 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
         return xs_html_tag("mark",
             xs_html_text(L("Truncated (too deep)")));
 
+    const char *lang = NULL;
+    const xs_dict *cmap = xs_dict_get(msg, "contentMap");
+    if (xs_is_dict(cmap)) {
+        const char *dummy;
+        int c = 0;
+
+        xs_dict_next(cmap, &lang, &dummy, &c);
+    }
+
     if (strcmp(type, "Follow") == 0) {
         return xs_html_tag("div",
             xs_html_attr("class", "snac-post"),
@@ -1959,7 +1950,7 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
                 xs_html_tag("div",
                     xs_html_attr("class", "snac-origin"),
                     xs_html_text(L("follows you"))),
-                html_msg_icon(read_only ? NULL : user, xs_dict_get(msg, "actor"), msg, proxy, NULL)));
+                html_msg_icon(read_only ? NULL : user, xs_dict_get(msg, "actor"), msg, proxy, NULL, lang)));
     }
     else
     if (!xs_match(type, POSTLIKE_OBJECT_TYPE)) {
@@ -2140,13 +2131,17 @@ xs_html *html_entry(snac *user, xs_dict *msg, int read_only,
     }
 
     xs_html_add(post_header,
-        html_msg_icon(read_only ? NULL : user, actor, msg, proxy, md5));
+        html_msg_icon(read_only ? NULL : user, actor, msg, proxy, md5, lang));
 
     /** post content **/
 
     xs_html *snac_content_wrap = xs_html_tag("div",
         xs_html_attr("class", "e-content snac-content"));
 
+    if (xs_is_string(lang))
+        xs_html_add(snac_content_wrap,
+            xs_html_attr("lang", lang));
+
     xs_html_add(entry,
         snac_content_wrap);
 
diff --git a/mastoapi.c b/mastoapi.c
index 7fa0078..a7d9c34 100644
--- a/mastoapi.c
+++ b/mastoapi.c
@@ -680,10 +680,10 @@ xs_dict *mastoapi_account(snac *logged, const xs_dict *actor)
 
             /* 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));
+                int fwing = following_list_len(&user);
+                int fwers = follower_list_len(&user);
+                xs *ni = xs_number_new(fwing);
+                xs *ne = xs_number_new(fwers);
 
                 acct = xs_dict_append(acct, "followers_count", ne);
                 acct = xs_dict_append(acct, "following_count", ni);
@@ -1309,10 +1309,10 @@ void credentials_get(char **body, char **ctype, int *status, snac snac)
 
     /* 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));
+        int fwing = following_list_len(&snac);
+        int fwers = follower_list_len(&snac);
+        xs *ni = xs_number_new(fwing);
+        xs *ne = xs_number_new(fwers);
 
         acct = xs_dict_append(acct, "followers_count", ne);
         acct = xs_dict_append(acct, "following_count", ni);
diff --git a/snac.h b/snac.h
index 2ab9a67..256731f 100644
--- a/snac.h
+++ b/snac.h
@@ -153,6 +153,7 @@ int follower_add(snac *snac, const char *actor);
 int follower_del(snac *snac, const char *actor);
 int follower_check(snac *snac, const char *actor);
 xs_list *follower_list(snac *snac);
+int follower_list_len(snac *snac);
 
 int pending_add(snac *user, const char *actor, const xs_dict *msg);
 int pending_check(snac *user, const char *actor);
@@ -184,6 +185,7 @@ int following_del(snac *snac, const char *actor);
 int following_check(snac *snac, const char *actor);
 int following_get(snac *snac, const char *actor, xs_dict **data);
 xs_list *following_list(snac *snac);
+int following_list_len(snac *snac);
 
 void mute(snac *snac, const char *actor);
 void unmute(snac *snac, const char *actor);