From 3ddf76c2aa09ed3e05fbe04c659d80c38a96af17 Mon Sep 17 00:00:00 2001
From: default <nobody@localhost>
Date: Tue, 7 Feb 2023 10:29:06 +0100
Subject: [PATCH] New function send_to_inbox_raw().

---
 activitypub.c | 20 ++++++++++++++++----
 httpd.c       |  6 +++---
 snac.h        | 12 +++++++++++-
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/activitypub.c b/activitypub.c
index 5c98389..8e17daa 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -160,14 +160,16 @@ int timeline_request(snac *snac, char **id, d_char **wrk)
 }
 
 
-int send_to_inbox(snac *snac, char *inbox, char *msg, d_char **payload, int *p_size, int timeout)
+int send_to_inbox_raw(const char *keyid, const char *seckey,
+                  const xs_str *inbox, const xs_dict *msg,
+                  xs_val **payload, int *p_size, int timeout)
 /* sends a message to an Inbox */
 {
     int status;
-    d_char *response;
-    xs *j_msg = xs_json_dumps_pp(msg, 4);
+    xs_dict *response;
+    xs *j_msg = xs_json_dumps_pp((xs_dict *)msg, 4);
 
-    response = http_signed_request(snac, "POST", inbox,
+    response = http_signed_request_raw(keyid, seckey, "POST", inbox,
         NULL, j_msg, strlen(j_msg), &status, payload, p_size, timeout);
 
     xs_free(response);
@@ -176,6 +178,16 @@ int send_to_inbox(snac *snac, char *inbox, char *msg, d_char **payload, int *p_s
 }
 
 
+int send_to_inbox(snac *snac, const xs_str *inbox, const xs_dict *msg,
+                  xs_val **payload, int *p_size, int timeout)
+/* sends a message to an Inbox */
+{
+    char *seckey = xs_dict_get(snac->key, "secret");
+
+    return send_to_inbox_raw(snac->actor, seckey, inbox, msg, payload, p_size, timeout);
+}
+
+
 d_char *get_actor_inbox(snac *snac, char *actor)
 /* gets an actor's inbox */
 {
diff --git a/httpd.c b/httpd.c
index 5cc6694..f747adc 100644
--- a/httpd.c
+++ b/httpd.c
@@ -295,14 +295,14 @@ static void *job_thread(void *arg)
 {
     long long pid = (long long)arg;
 
-    srv_debug(1, xs_fmt("job thread %ld started", pid));
+    srv_debug(0, xs_fmt("job thread %ld started", pid));
 
     for (;;) {
         xs *job = NULL;
 
         job_wait(&job);
 
-        srv_debug(1, xs_fmt("job thread %ld wake up", pid));
+        srv_debug(0, xs_fmt("job thread %ld wake up", pid));
 
         if (job == NULL)
             break;
@@ -322,7 +322,7 @@ static void *job_thread(void *arg)
         }
     }
 
-    srv_debug(1, xs_fmt("job thread %ld stopped", pid));
+    srv_debug(0, xs_fmt("job thread %ld stopped", pid));
 
     return NULL;
 }
diff --git a/snac.h b/snac.h
index 866986c..e3ab4a8 100644
--- a/snac.h
+++ b/snac.h
@@ -142,6 +142,12 @@ xs_dict *dequeue(const char *fn);
 void purge(snac *snac);
 void purge_all(void);
 
+xs_dict *http_signed_request_raw(const char *keyid, const char *seckey,
+                            const char *method, const char *url,
+                            xs_dict *headers,
+                            const char *body, int b_size,
+                            int *status, xs_str **payload, int *p_size,
+                            int timeout);
 xs_dict *http_signed_request(snac *snac, const char *method, const char *url,
                             xs_dict *headers,
                             const char *body, int b_size,
@@ -168,7 +174,11 @@ d_char *msg_update(snac *snac, char *object);
 
 int activitypub_request(snac *snac, char *url, d_char **data);
 int actor_request(snac *snac, char *actor, d_char **data);
-int send_to_inbox(snac *snac, char *inbox, char *msg, d_char **payload, int *p_size, int timeout);
+int send_to_inbox_raw(const char *keyid, const char *seckey,
+                  const xs_str *inbox, const xs_dict *msg,
+                  xs_val **payload, int *p_size, int timeout);
+int send_to_inbox(snac *snac, const xs_str *inbox, const xs_dict *msg,
+                  xs_val **payload, int *p_size, int timeout);
 d_char *get_actor_inbox(snac *snac, char *actor);
 int send_to_actor(snac *snac, char *actor, char *msg, d_char **payload, int *p_size, int timeout);
 int is_msg_public(snac *snac, char *msg);