1 files changed, 80 insertions, 23 deletions

diff --git a/html.c b/html.c
index 2c0a823..cd8279e 100644
--- a/html.c
+++ b/html.c
@@ -934,7 +934,7 @@ static xs_html *html_user_body(snac *user, int read_only)
                     }
                 }
                 else
-                if (xs_startswith(v, "gemini:/")) {
+                if (xs_startswith(v, "gemini:/") || xs_startswith(v, "xmpp:")) {
                     value = xs_html_tag("a",
                         xs_html_attr("rel", "me"),
                         xs_html_attr("href", v),
@@ -1034,6 +1034,23 @@ xs_html *html_top_controls(snac *snac)
                     xs_html_attr("value",   L("Boost"))),
                 xs_html_text(" "),
                 xs_html_text(L("(by URL)"))),
+            xs_html_tag("p", NULL),
+            xs_html_tag("form",
+                xs_html_attr("autocomplete", "off"),
+                xs_html_attr("method",       "post"),
+                xs_html_attr("action",       ops_action),
+                xs_html_sctag("input",
+                    xs_html_attr("type",     "text"),
+                    xs_html_attr("name",     "id"),
+                    xs_html_attr("required", "required"),
+                    xs_html_attr("placeholder", "https:/" "/fedi.example.com/bob/...")),
+                xs_html_text(" "),
+                xs_html_sctag("input",
+                    xs_html_attr("type",    "submit"),
+                    xs_html_attr("name",    "action"),
+                    xs_html_attr("value",   L("Like"))),
+                xs_html_text(" "),
+                xs_html_text(L("(by URL)"))),
             xs_html_tag("p", NULL)));
 
     /** user settings **/
@@ -2917,6 +2934,8 @@ int html_get_handler(const xs_dict *req, const char *q_path,
     int proxy = 0;
     const char *v;
 
+    const xs_dict *q_vars = xs_dict_get(req, "q_vars");
+
     xs *l = xs_split_n(q_path, "/", 2);
     v = xs_list_get(l, 1);
 
@@ -2925,6 +2944,23 @@ int html_get_handler(const xs_dict *req, const char *q_path,
         return HTTP_STATUS_NOT_FOUND;
     }
 
+    if (strcmp(v, "share-bridge") == 0) {
+        /* temporary redirect for a post */
+        const char *login = xs_dict_get(q_vars, "login");
+        const char *content = xs_dict_get(q_vars, "content");
+
+        if (xs_type(login) == XSTYPE_STRING && xs_type(content) == XSTYPE_STRING) {
+            xs *b64 = xs_base64_enc(content, strlen(content));
+
+            srv_log(xs_fmt("share-bridge for user '%s'", login));
+
+            *body = xs_fmt("%s/%s/share?content=%s", srv_baseurl, login, b64);
+            return HTTP_STATUS_SEE_OTHER;
+        }
+        else
+            return HTTP_STATUS_NOT_FOUND;
+    }
+
     uid = xs_dup(v);
 
     /* rss extension? */
@@ -2959,7 +2995,6 @@ int html_get_handler(const xs_dict *req, const char *q_path,
     int def_show = xs_number_get(xs_dict_get(srv_config, "max_timeline_entries"));
     int show = def_show;
 
-    const xs_dict *q_vars = xs_dict_get(req, "q_vars");
     if ((v = xs_dict_get(q_vars, "skip")) != NULL)
         skip = atoi(v), cache = 0, save = 0;
     if ((v = xs_dict_get(q_vars, "show")) != NULL)
@@ -3045,32 +3080,30 @@ int html_get_handler(const xs_dict *req, const char *q_path,
                     q = url_acct;
                 }
                 else {
-                    /* if it's not already here, try to bring it to the user's timeline */
-                    xs *md5 = xs_md5_hex(q, strlen(q));
-
-                    if (!timeline_here(&snac, md5)) {
-                        xs *object = NULL;
-                        int status;
+                    /* bring it to the user's timeline */
+                    xs *object = NULL;
+                    int status;
 
-                        status = activitypub_request(&snac, q, &object);
-                        snac_debug(&snac, 1, xs_fmt("Request searched URL %s %d", q, status));
+                    status = activitypub_request(&snac, q, &object);
+                    snac_debug(&snac, 1, xs_fmt("Request searched URL %s %d", q, status));
 
-                        if (valid_status(status)) {
-                            /* got it; also request the actor */
-                            const char *attr_to = get_atto(object);
+                    if (valid_status(status)) {
+                        /* got it; also request the actor */
+                        const char *attr_to = get_atto(object);
 
-                            if (!xs_is_null(attr_to)) {
-                                status = actor_request(&snac, attr_to, &actor_obj);
+                        if (!xs_is_null(attr_to)) {
+                            status = actor_request(&snac, attr_to, &actor_obj);
 
-                                snac_debug(&snac, 1, xs_fmt("Request author %s of %s %d", attr_to, q, status));
+                            if (valid_status(status)) {
+                                /* reset the query string to be the real id */
+                                url_acct = xs_dup(xs_dict_get(object, "id"));
+                                q = url_acct;
 
-                                if (valid_status(status)) {
-                                    /* add the actor */
-                                    actor_add(attr_to, actor_obj);
+                                /* add the post to the timeline */
+                                xs *md5 = xs_md5_hex(q, strlen(q));
 
-                                    /* add the post to the timeline */
+                                if (!timeline_here(&snac, md5))
                                     timeline_add(&snac, q, object);
-                                }
                             }
                         }
                     }
@@ -3473,6 +3506,30 @@ int html_get_handler(const xs_dict *req, const char *q_path,
         }
     }
     else
+    if (strcmp(p_path, "share") == 0) { /** direct post **/
+        if (!login(&snac, req)) {
+            *body  = xs_dup(uid);
+            status = HTTP_STATUS_UNAUTHORIZED;
+        }
+        else {
+            const char *b64 = xs_dict_get(q_vars, "content");
+            int sz;
+            xs *content = xs_base64_dec(b64, &sz);
+            xs *msg = msg_note(&snac, content, NULL, NULL, NULL, 0, NULL);
+            xs *c_msg = msg_create(&snac, msg);
+
+            timeline_add(&snac, xs_dict_get(msg, "id"), msg);
+
+            enqueue_message(&snac, c_msg);
+
+            snac_debug(&snac, 1, xs_fmt("web action 'share' received"));
+
+            *body   = xs_fmt("%s/admin", snac.actor);
+            *b_size = strlen(*body);
+            status  = HTTP_STATUS_SEE_OTHER;
+        }
+    }
+    else
         status = HTTP_STATUS_NOT_FOUND;
 
     user_free(&snac);
@@ -3604,7 +3661,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
                 enqueue_close_question(&snac, xs_dict_get(msg, "id"), end_secs);
             }
             else
-                msg = msg_note(&snac, content_2, to, in_reply_to, attach_list, priv);
+                msg = msg_note(&snac, content_2, to, in_reply_to, attach_list, priv, NULL);
 
             if (sensitive != NULL) {
                 msg = xs_dict_set(msg, "sensitive", xs_stock(XSTYPE_TRUE));
@@ -4038,7 +4095,7 @@ int html_post_handler(const xs_dict *req, const char *q_path,
         int c = 0;
 
         while (xs_list_next(ls, &v, &c)) {
-            xs *msg = msg_note(&snac, "", actor, irt, NULL, 1);
+            xs *msg = msg_note(&snac, "", actor, irt, NULL, 1, NULL);
 
             /* set the option */
             msg = xs_dict_append(msg, "name", v);