Don't load unneeded actor info in html_entry().

This commit is contained in:
default 2022-10-24 20:06:02 +02:00
parent 13ac53b06a
commit d2095105de
3 changed files with 16 additions and 19 deletions

3
data.c
View file

@ -796,16 +796,17 @@ int actor_get(snac *snac, char *actor, d_char **data)
status = 200; status = 200;
} }
if (data) {
if ((f = fopen(fn, "r")) != NULL) { if ((f = fopen(fn, "r")) != NULL) {
xs *j = xs_readall(f); xs *j = xs_readall(f);
fclose(f); fclose(f);
if (data)
*data = xs_json_loads(j); *data = xs_json_loads(j);
} }
else else
status = 500; status = 500;
}
return status; return status;
} }

6
html.c
View file

@ -443,7 +443,6 @@ d_char *html_entry(snac *snac, d_char *os, char *msg, xs_set *seen, int local, i
char *id = xs_dict_get(msg, "id"); char *id = xs_dict_get(msg, "id");
char *type = xs_dict_get(msg, "type"); char *type = xs_dict_get(msg, "type");
char *meta = xs_dict_get(msg, "_snac"); char *meta = xs_dict_get(msg, "_snac");
xs *actor_o = NULL;
char *actor; char *actor;
/* do not show non-public messages in the public timeline */ /* do not show non-public messages in the public timeline */
@ -477,10 +476,7 @@ d_char *html_entry(snac *snac, d_char *os, char *msg, xs_set *seen, int local, i
if (is_muted(snac, actor)) if (is_muted(snac, actor))
return os; return os;
if (strcmp(actor, snac->actor) == 0) if (strcmp(actor, snac->actor) != 0 && !valid_status(actor_get(snac, actor, NULL)))
actor_o = msg_actor(snac);
else
if (!valid_status(actor_get(snac, actor, &actor_o)))
return os; return os;
/* if this is our post, add the score */ /* if this is our post, add the score */

View file

@ -99,7 +99,7 @@ void httpd_connection(FILE *f)
xs *req; xs *req;
char *method; char *method;
int status = 0; int status = 0;
char *body = NULL; d_char *body = NULL;
int b_size = 0; int b_size = 0;
char *ctype = NULL; char *ctype = NULL;
xs *headers = NULL; xs *headers = NULL;