commit 90838f0

Minor actor name code refactoring.

 1@@ -37,19 +37,16 @@ int login(snac *snac, char *headers)
 2 }
 3 
 4 
 5-d_char *html_actor_icon(snac *snac, d_char *os, char *actor,
 6-    const char *date, const char *udate, const char *url, int priv)
 7+xs_str *actor_name(xs_dict *actor)
 8+/* gets the actor name */
 9 {
10-    xs *s = xs_str_new(NULL);
11-
12-    xs *name   = NULL;
13-    xs *avatar = NULL;
14-    char *p, *v;
15+    xs_list *p;
16+    char *v;
17+    xs_str *name;
18 
19-    /* get the name */
20     if (xs_is_null((v = xs_dict_get(actor, "name"))) || *v == '\0') {
21-        if (xs_is_null(v = xs_dict_get(actor, "preferredUsername"))) {
22-            v = "user";
23+        if (xs_is_null(v = xs_dict_get(actor, "preferredUsername")) || *v == '\0') {
24+            v = "anonymous";
25         }
26     }
27 
28@@ -75,6 +72,20 @@ d_char *html_actor_icon(snac *snac, d_char *os, char *actor,
29         }
30     }
31 
32+    return name;
33+}
34+
35+
36+d_char *html_actor_icon(snac *snac, d_char *os, char *actor,
37+    const char *date, const char *udate, const char *url, int priv)
38+{
39+    xs *s = xs_str_new(NULL);
40+
41+    xs *avatar = NULL;
42+    char *v;
43+
44+    xs *name = actor_name(actor);
45+
46     /* get the avatar */
47     if ((v = xs_dict_get(actor, "icon")) != NULL &&
48         (v = xs_dict_get(v, "url")) != NULL) {
49@@ -708,10 +719,7 @@ d_char *html_entry(snac *snac, d_char *os, char *msg, int local, int level, cons
50         }
51         else
52         if (valid_status(object_get_by_md5(p, &actor_r))) {
53-            char *name;
54-
55-            if ((name = xs_dict_get(actor_r, "name")) == NULL)
56-                name = xs_dict_get(actor_r, "preferredUsername");
57+            xs *name = actor_name(actor_r);
58 
59             if (!xs_is_null(name)) {
60                 xs *s1 = xs_fmt(