diff options
| -rw-r--r-- | activitypub.c | 8 | ||||
| -rw-r--r-- | data.c | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/activitypub.c b/activitypub.c index 5afe304..9ec7c37 100644 --- a/activitypub.c +++ b/activitypub.c @@ -118,7 +118,7 @@ int activitypub_request(snac *user, const char *url, xs_dict **data) int actor_request(const char *actor, xs_dict **data) /* request an actor */ { - int status, status2; + int status; xs *payload = NULL; if (data) @@ -129,9 +129,9 @@ int actor_request(const char *actor, xs_dict **data) if (status != 200) { /* actor data non-existent or stale: get from the net */ - status2 = activitypub_request(NULL, actor, &payload); + status = activitypub_request(NULL, actor, &payload); - if (valid_status(status2)) { + if (valid_status(status)) { /* renew data */ status = actor_add(actor, payload); @@ -141,7 +141,7 @@ int actor_request(const char *actor, xs_dict **data) } } else - srv_debug(0, xs_fmt("actor_request error %d", status2)); + srv_debug(0, xs_fmt("actor_request error %s %d", actor, status)); } /* collect the (presumed) shared inbox in this actor */ @@ -649,10 +649,14 @@ int _object_add(const char *id, const xs_dict *obj, int ow) xs *fn = _object_fn(id); FILE *f; - if (!ow && mtime(fn) > 0.0) { - /* object already here */ - srv_debug(1, xs_fmt("object_add object already here %s", id)); - return 204; /* No content */ + if (mtime(fn) > 0.0) { + if (!ow) { + /* object already here */ + srv_debug(1, xs_fmt("object_add object already here %s", id)); + return 204; /* No content */ + } + else + status = 200; } if ((f = fopen(fn, "w")) != NULL) { |