1 files changed, 18 insertions, 6 deletions

diff --git a/activitypub.c b/activitypub.c
index 5e55b8a..0535269 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -17,6 +17,7 @@
 
 #include "snac.h"
 
+#include <stddef.h>
 #include <sys/wait.h>
 
 const char * const public_address = "https:/" "/www.w3.org/ns/activitystreams#Public";
@@ -1611,7 +1612,7 @@ xs_dict *msg_emoji_init(snac *snac, const char *mid, const char *eid_o)
     xs *dict = xs_dict_new();
     xs *icon = xs_dict_new();
     xs *accounts = xs_list_new();
-    xs *emjs = emojis();
+    xs *emjs = emojis_rm_categories();
 
     /* may be a default emoji */
     xs *eidd = xs_dup(eid);
@@ -1920,6 +1921,9 @@ xs_dict *msg_actor(snac *snac)
     if (xs_type(location) == XSTYPE_DICT)
         msg = xs_dict_set(msg, "location", location);
 
+    xs *webfinger = xs_fmt("%s@%s", snac->uid, xs_dict_get(srv_config, "host"));
+    msg = xs_dict_set(msg, "webfinger", webfinger);
+
     /* cache it */
     snac_debug(snac, 1, xs_fmt("Caching actor %s", snac->actor));
     object_add_ow(snac->actor, msg);
@@ -2321,9 +2325,17 @@ xs_dict *msg_question(snac *user, const char *content, xs_list *attach,
 /* creates a Question message */
 {
     xs_dict *msg = msg_note(user, content, NULL, NULL, attach, 0, NULL, NULL);
-    int max      = 8;
+    const xs_number *max_options = xs_dict_get(srv_config, "max_poll_options");
+    const xs_number *max_length = xs_dict_get(srv_config, "max_poll_option_length");
     xs_set seen;
 
+    size_t max_line = 60;
+    int max = 8;
+    if (xs_type(max_options) == XSTYPE_NUMBER)
+        max = xs_number_get(max_options);
+    if (xs_type(max_length) == XSTYPE_NUMBER)
+        max_line = xs_number_get(max_length);
+
     msg = xs_dict_set(msg, "type", "Question");
 
     /* make it non-editable */
@@ -2341,8 +2353,8 @@ xs_dict *msg_question(snac *user, const char *content, xs_list *attach,
             xs *v2 = xs_dup(v);
             xs *d  = xs_dict_new();
 
-            if (strlen(v2) > 60) {
-                v2[60] = '\0';
+            if (strlen(v2) > max_line) {
+                v2[max_line] = '\0';
                 v2 = xs_str_cat(v2, "...");
             }
 
@@ -2958,7 +2970,7 @@ int process_input_message(snac *snac, const xs_dict *msg, const xs_dict *req)
         if (xs_is_null(object))
             snac_log(snac, xs_fmt("malformed message: no 'id' field"));
         else
-        if (timeline_admire(snac, object, actor, 1, xs_dup(msg)) == HTTP_STATUS_CREATED)
+        if (timeline_admire(snac, object, actor, 1, msg) == HTTP_STATUS_CREATED)
             snac_log(snac, xs_fmt("new '%s' %s %s", type, actor, object));
         else
             snac_log(snac, xs_fmt("repeated '%s' from %s to %s", type, actor, object));
@@ -3395,7 +3407,7 @@ void process_user_queue_item(snac *user, xs_dict *q_item)
                 actor_add(actor, actor_o);
             }
             else {
-                if (status == HTTP_STATUS_GONE) {
+                if (status == HTTP_STATUS_GONE || status == HTTP_STATUS_NOT_FOUND) {
                     actor_failure(actor, 1);
                     snac_log(user, xs_fmt("actor_refresh marking actor %s as broken %d", actor, status));
                 }