commit 0e6c5f9

actor_request() does not need a user argument.

 1@@ -115,7 +115,7 @@ int activitypub_request(snac *user, const char *url, xs_dict **data)
 2 }
 3 
 4 
 5-int actor_request(snac *user, const char *actor, xs_dict **data)
 6+int actor_request(const char *actor, xs_dict **data)
 7 /* request an actor */
 8 {
 9     int status, status2;
10@@ -129,7 +129,7 @@ int actor_request(snac *user, const char *actor, xs_dict **data)
11 
12     if (status != 200) {
13         /* actor data non-existent or stale: get from the net */
14-        status2 = activitypub_request(user, actor, &payload);
15+        status2 = activitypub_request(NULL, actor, &payload);
16 
17         if (valid_status(status2)) {
18             /* renew data */
19@@ -205,7 +205,7 @@ int timeline_request(snac *snac, char **id, xs_str **wrk, int level)
20 
21                     /* request (and drop) the actor for this entry */
22                     if (!xs_is_null(actor))
23-                        actor_request(snac, actor, NULL);
24+                        actor_request(actor, NULL);
25 
26                     /* does it have an ancestor? */
27                     char *in_reply_to = xs_dict_get(object, "inReplyTo");
28@@ -329,7 +329,7 @@ xs_str *get_actor_inbox(snac *snac, const char *actor)
29     xs *data = NULL;
30     char *v = NULL;
31 
32-    if (valid_status(actor_request(snac, actor, &data))) {
33+    if (valid_status(actor_request(actor, &data))) {
34         /* try first endpoints/sharedInbox */
35         if ((v = xs_dict_get(data, "endpoints")))
36             v = xs_dict_get(v, "sharedInbox");
37@@ -1093,7 +1093,7 @@ xs_dict *msg_follow(snac *snac, const char *q)
38     }
39 
40     /* request the actor */
41-    status = actor_request(snac, actor, &actor_o);
42+    status = actor_request(actor, &actor_o);
43 
44     if (valid_status(status)) {
45         /* check if the actor is an alias */
46@@ -1499,7 +1499,7 @@ int process_input_message(snac *snac, xs_dict *msg, xs_dict *req)
47         utype = "(null)";
48 
49     /* bring the actor */
50-    a_status = actor_request(snac, actor, &actor_o);
51+    a_status = actor_request(actor, &actor_o);
52 
53     /* do not retry permanent failures */
54     if (a_status == 404 || a_status == 410 || a_status < 0) {
55@@ -1681,7 +1681,7 @@ int process_input_message(snac *snac, xs_dict *msg, xs_dict *req)
56                     /* bring the actor */
57                     xs *who_o = NULL;
58 
59-                    if (valid_status(actor_request(snac, who, &who_o))) {
60+                    if (valid_status(actor_request(who, &who_o))) {
61                         timeline_admire(snac, object, actor, 0);
62                         snac_log(snac, xs_fmt("new 'Announce' %s %s", actor, object));
63                         do_notify = 1;

1@@ -173,7 +173,7 @@ int check_signature(snac *user, xs_dict *req, xs_str **err)
2 
3     xs *actor = NULL;
4 
5-    if (!valid_status(actor_request(user, keyId, &actor))) {
6+    if (!valid_status(actor_request(keyId, &actor))) {
7         *err = xs_fmt("unknown actor %s", keyId);
8         return 0;
9     }

 1@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
 2         xs *actor = NULL;
 3         int status;
 4 
 5-        status = actor_request(NULL, user, &actor);
 6+        status = actor_request(user, &actor);
 7 
 8         printf("status: %d\n", status);
 9         if (valid_status(status)) {
10@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
11     if (strcmp(cmd, "ping") == 0) { /** **/
12         xs *actor_o = NULL;
13 
14-        if (valid_status(actor_request(&snac, url, &actor_o))) {
15+        if (valid_status(actor_request(url, &actor_o))) {
16             xs *msg = msg_ping(&snac, url);
17 
18             enqueue_output_by_actor(&snac, msg, url, 0);
19@@ -409,7 +409,7 @@ int main(int argc, char *argv[])
20         int status;
21         xs *data = NULL;
22 
23-        status = actor_request(&snac, url, &data);
24+        status = actor_request(url, &data);
25 
26         printf("status: %d\n", status);
27 

1@@ -1944,7 +1944,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
2                     if (valid_status(webfinger_request(q, &actor, &user))) {
3                         xs *actor_o = NULL;
4 
5-                        if (valid_status(actor_request(&snac1, actor, &actor_o))) {
6+                        if (valid_status(actor_request(actor, &actor_o))) {
7                             xs *acct = mastoapi_account(actor_o);
8 
9                             acl = xs_list_append(acl, acct);

1@@ -242,7 +242,7 @@ xs_dict *msg_question(snac *user, const char *content, xs_list *attach,
2                       const xs_list *opts, int multiple, int end_secs);
3 
4 int activitypub_request(snac *snac, const char *url, xs_dict **data);
5-int actor_request(snac *snac, const char *actor, xs_dict **data);
6+int actor_request(const char *actor, xs_dict **data);
7 void timeline_request_replies(snac *user, const char *id);
8 int send_to_inbox_raw(const char *keyid, const char *seckey,
9                   const xs_str *inbox, const xs_dict *msg,