1 files changed, 67 insertions, 15 deletions

diff --git a/activitypub.c b/activitypub.c
index 34cc32f..ea4d8ea 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -10,6 +10,7 @@
 #include "xs_time.h"
 #include "xs_set.h"
 #include "xs_match.h"
+#include "xs_unicode.h"
 
 #include "snac.h"
 
@@ -178,6 +179,11 @@ const char *get_atto(const xs_dict *msg)
             }
         }
     }
+    else
+    if (xs_type(actor) == XSTYPE_DICT) {
+        /* bandwagon.fm returns this */
+        actor = xs_dict_get(actor, "id");
+    }
 
     return actor;
 }
@@ -701,6 +707,32 @@ int is_msg_for_me(snac *snac, const xs_dict *c_msg)
         }
     }
 
+    /* does this message contain a tag we are following? */
+    const xs_list *fw_tags = xs_dict_get(snac->config, "followed_hashtags");
+    if (pub_msg && xs_type(fw_tags) == XSTYPE_LIST) {
+        const xs_list *tags_in_msg = xs_dict_get(msg, "tag");
+        if (xs_type(tags_in_msg) == XSTYPE_LIST) {
+            const xs_dict *te;
+
+            /* iterate the tags in the message */
+            xs_list_foreach(tags_in_msg, te) {
+                if (xs_type(te) == XSTYPE_DICT) {
+                    const char *type = xs_dict_get(te, "type");
+                    const char *name = xs_dict_get(te, "name");
+
+                    if (xs_type(type) == XSTYPE_STRING && xs_type(name) == XSTYPE_STRING) {
+                        if (strcmp(type, "Hashtag") == 0) {
+                            xs *lc_name = xs_utf8_to_lower(name);
+
+                            if (xs_list_in(fw_tags, lc_name) != -1)
+                                return 7;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     return 0;
 }
 
@@ -1390,7 +1422,8 @@ xs_dict *msg_follow(snac *snac, const char *q)
 
 
 xs_dict *msg_note(snac *snac, const xs_str *content, const xs_val *rcpts,
-                  const xs_str *in_reply_to, const xs_list *attach, int priv)
+                  const xs_str *in_reply_to, const xs_list *attach,
+                  int priv, const char *lang_str)
 /* creates a 'Note' message */
 {
     xs *ntid = tid(0);
@@ -1552,6 +1585,20 @@ xs_dict *msg_note(snac *snac, const xs_str *content, const xs_val *rcpts,
     if (xs_list_len(atls))
         msg = xs_dict_append(msg, "attachment", atls);
 
+    /* set language content map */
+    if (xs_type(lang_str) == XSTYPE_STRING) {
+        /* split at the first _ */
+        xs *l0 = xs_split(lang_str, "_");
+        const char *lang = xs_list_get(l0, 0);
+
+        if (xs_type(lang) == XSTYPE_STRING && strlen(lang) == 2) {
+            /* a valid ISO language id */
+            xs *cmap = xs_dict_new();
+            cmap = xs_dict_set(cmap, lang, xs_dict_get(msg, "content"));
+            msg = xs_dict_set(msg, "contentMap", cmap);
+        }
+    }
+
     return msg;
 }
 
@@ -1593,7 +1640,7 @@ xs_dict *msg_question(snac *user, const char *content, xs_list *attach,
                       const xs_list *opts, int multiple, int end_secs)
 /* creates a Question message */
 {
-    xs_dict *msg = msg_note(user, content, NULL, NULL, attach, 0);
+    xs_dict *msg = msg_note(user, content, NULL, NULL, attach, 0, NULL);
     int max      = 8;
     xs_set seen;
 
@@ -2386,22 +2433,28 @@ void process_user_queue_item(snac *snac, xs_dict *q_item)
         xs *rcpts = recipient_list(snac, msg, 1);
         xs_set inboxes;
         const xs_str *actor;
-        int c;
 
         xs_set_init(&inboxes);
 
+        /* add this shared inbox first */
+        xs *this_shared_inbox = xs_fmt("%s/shared-inbox", srv_baseurl);
+        xs_set_add(&inboxes, this_shared_inbox);
+        enqueue_output(snac, msg, this_shared_inbox, 0, 0);
+
         /* iterate the recipients */
-        c = 0;
-        while (xs_list_next(rcpts, &actor, &c)) {
-            xs *inbox = get_actor_inbox(actor, 1);
-
-            if (inbox != NULL) {
-                /* add to the set and, if it's not there, send message */
-                if (xs_set_add(&inboxes, inbox) == 1)
-                    enqueue_output(snac, msg, inbox, 0, 0);
+        xs_list_foreach(rcpts, actor) {
+            /* local users were served by this_shared_inbox */
+            if (!xs_startswith(actor, srv_baseurl)) {
+                xs *inbox = get_actor_inbox(actor, 1);
+
+                if (inbox != NULL) {
+                    /* add to the set and, if it's not there, send message */
+                    if (xs_set_add(&inboxes, inbox) == 1)
+                        enqueue_output(snac, msg, inbox, 0, 0);
+                }
+                else
+                    snac_log(snac, xs_fmt("cannot find inbox for %s", actor));
             }
-            else
-                snac_log(snac, xs_fmt("cannot find inbox for %s", actor));
         }
 
         /* if it's a public note or question, send to the collected inboxes */
@@ -2410,8 +2463,7 @@ void process_user_queue_item(snac *snac, xs_dict *q_item)
                 xs *shibx = inbox_list();
                 const xs_str *inbox;
 
-                c = 0;
-                while (xs_list_next(shibx, &inbox, &c)) {
+                xs_list_foreach(shibx, inbox) {
                     if (xs_set_add(&inboxes, inbox) == 1)
                         enqueue_output(snac, msg, inbox, 0, 0);
                 }