Check for muted actors in Announce messages.

This commit is contained in:
default 2022-09-28 05:16:17 +02:00
parent 03b0e105b5
commit 3b8a43013d

View file

@ -563,6 +563,7 @@ void process_message(snac *snac, char *msg, char *req)
/* actor and type exist, were checked previously */ /* actor and type exist, were checked previously */
char *actor = xs_dict_get(msg, "actor"); char *actor = xs_dict_get(msg, "actor");
char *type = xs_dict_get(msg, "type"); char *type = xs_dict_get(msg, "type");
xs *actor_o = NULL;
char *object, *utype; char *object, *utype;
@ -572,6 +573,9 @@ void process_message(snac *snac, char *msg, char *req)
else else
utype = "(null)"; utype = "(null)";
/* bring the actor */
actor_request(snac, actor, &actor_o);
/* check the signature */ /* check the signature */
/* ... */ /* ... */
@ -632,14 +636,26 @@ void process_message(snac *snac, char *msg, char *req)
} }
else else
if (strcmp(type, "Announce") == 0) { if (strcmp(type, "Announce") == 0) {
xs *a_msg = NULL;
if (xs_type(object) == XSTYPE_DICT) if (xs_type(object) == XSTYPE_DICT)
object = xs_dict_get(object, "id"); object = xs_dict_get(object, "id");
timeline_request(snac, object, actor); timeline_request(snac, object, actor);
if ((a_msg = timeline_find(snac, object)) != NULL) {
char *who = xs_dict_get(a_msg, "attributedTo");
if (who && !is_muted(snac, who)) {
timeline_admire(snac, object, actor, 0); timeline_admire(snac, object, actor, 0);
snac_log(snac, xs_fmt("new 'Announce' %s %s", actor, object)); snac_log(snac, xs_fmt("new 'Announce' %s %s", actor, object));
} }
else
snac_log(snac, xs_fmt("ignored 'Announce' about muted actor %s", who));
}
else
snac_log(snac, xs_fmt("error requesting 'Announce' object %s", object));
}
/* /*
else else
if (strcmp(type, "Update") == 0) { if (strcmp(type, "Update") == 0) {