monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-22 13:25:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

actor_get() and actor_add() now use the object database.

Browse source
This commit is contained in:
default 2022-11-23 16:13:51 +01:00
parent 2a5f10583b
commit 01a62669f6
2 changed files with 23 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
data.c
View file

@ -243,6 +243,8 @@ int object_get(const char *id, d_char **obj, const char *type)
else else
*obj = NULL; *obj = NULL;
srv_debug(2, xs_fmt("object_get %s %d", id, status));
return status; return status;
} }
@ -265,6 +267,8 @@ int object_add(const char *id, d_char *obj)
else else
status = 500; status = 500;
srv_debug(2, xs_fmt("object_add %s %d", id, status));
return status; return status;
} }
@ -938,57 +942,43 @@ d_char *_actor_fn(snac *snac, char *actor)
} }
int actor_add(snac *snac, char *actor, char *msg) int actor_add(snac *snac, const char *actor, d_char *msg)
/* adds an actor */ /* adds an actor */
{ {
int ret = 201; /* created */ return object_add(actor, msg);
xs *fn = _actor_fn(snac, actor);
FILE *f;
if ((f = fopen(fn, "w")) != NULL) {
xs *j = xs_json_dumps_pp(msg, 4);
fwrite(j, 1, strlen(j), f);
fclose(f);
}
else
ret = 500;
snac_debug(snac, 2, xs_fmt("actor_add %s %s", actor, fn));
// object_add(actor, msg);
return ret;
} }
int actor_get(snac *snac, char *actor, d_char **data) int actor_get(snac *snac, const char *actor, d_char **data)
/* returns an already downloaded actor */ /* returns an already downloaded actor */
{ {
xs *fn = _actor_fn(snac, actor); int status = 200;
double t; char *d;
double max_time;
int status;
FILE *f;
if (strcmp(actor, snac->actor) == 0) { if (strcmp(actor, snac->actor) == 0) {
/* this actor */
if (data) if (data)
*data = msg_actor(snac); *data = msg_actor(snac);
return 200; return status;
} }
t = mtime(fn); /* read the object */
if (!valid_status(status = object_get(actor, &d, "Person")))
return status;
/* no mtime? there is nothing here */ if (data)
if (t == 0.0) *data = d;
return 404;
xs *fn = _object_fn_by_id(actor);
double max_time;
/* maximum time for the actor data to be considered stale */ /* maximum time for the actor data to be considered stale */
max_time = 3600.0 * 36.0; max_time = 3600.0 * 36.0;
if (t + max_time < (double) time(NULL)) { if (mtime(fn) + max_time < (double) time(NULL)) {
/* actor data exists but also stinks */ /* actor data exists but also stinks */
FILE *f;
if ((f = fopen(fn, "a")) != NULL) { if ((f = fopen(fn, "a")) != NULL) {
/* write a blank at the end to 'touch' the file */ /* write a blank at the end to 'touch' the file */
@ -998,22 +988,6 @@ int actor_get(snac *snac, char *actor, d_char **data)
status = 205; /* "205: Reset Content" "110: Response Is Stale" */ status = 205; /* "205: Reset Content" "110: Response Is Stale" */
} }
else {
/* it's still valid */
status = 200;
}
if (data) {
if ((f = fopen(fn, "r")) != NULL) {
xs *j = xs_readall(f);
fclose(f);
*data = xs_json_loads(j);
}
else
status = 500;
}
return status; return status;
} }

4
snac.h
View file

@ -80,8 +80,8 @@ void mute(snac *snac, char *actor);
void unmute(snac *snac, char *actor); void unmute(snac *snac, char *actor);
int is_muted(snac *snac, char *actor); int is_muted(snac *snac, char *actor);
int actor_add(snac *snac, char *actor, char *msg); int actor_add(snac *snac, const char *actor, d_char *msg);
int actor_get(snac *snac, char *actor, d_char **data); int actor_get(snac *snac, const char *actor, d_char **data);
int static_get(snac *snac, const char *id, d_char **data, int *size); int static_get(snac *snac, const char *id, d_char **data, int *size);
void static_put(snac *snac, const char *id, const char *data, int size); void static_put(snac *snac, const char *id, const char *data, int size);