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

Some fixes to 'Undo' messages.

Browse source 
msg_undo() now generates valid messages for objects that are only
referenced by its id.
This commit is contained in:
default 2023-08-31 16:11:58 +02:00
parent dfeb4668a7
commit 57c84d1c3a
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
activitypub.c
View file

@ -761,6 +761,12 @@ xs_dict *msg_base(snac *snac, const char *type, const char *id,
xs *did = NULL; xs *did = NULL;
xs *published = NULL; xs *published = NULL;
xs *ntid = tid(0); xs *ntid = tid(0);
const char *obj_id;
if (xs_type(object) == XSTYPE_DICT)
obj_id = xs_dict_get(object, "id");
else
obj_id = object;
/* generated values */ /* generated values */
if (date && strcmp(date, "@now") == 0) { if (date && strcmp(date, "@now") == 0) {
@ -776,8 +782,8 @@ xs_dict *msg_base(snac *snac, const char *type, const char *id,
} }
else else
if (strcmp(id, "@object") == 0) { if (strcmp(id, "@object") == 0) {
if (object != NULL) { if (obj_id != NULL) {
did = xs_fmt("%s/%s_%s", xs_dict_get(object, "id"), type, ntid); did = xs_fmt("%s/%s_%s", obj_id, type, ntid);
id = did; id = did;
} }
else else
@ -788,7 +794,7 @@ xs_dict *msg_base(snac *snac, const char *type, const char *id,
/* like @object, but always generate the same id */ /* like @object, but always generate the same id */
if (object != NULL) { if (object != NULL) {
date = xs_dict_get(object, "published"); date = xs_dict_get(object, "published");
did = xs_fmt("%s/%s", xs_dict_get(object, "id"), type); did = xs_fmt("%s/%s", obj_id, type);
id = did; id = did;
} }
else else
@ -996,8 +1002,10 @@ xs_dict *msg_undo(snac *snac, char *object)
/* creates an 'Undo' message */ /* creates an 'Undo' message */
{ {
xs_dict *msg = msg_base(snac, "Undo", "@object", snac->actor, "@now", object); xs_dict *msg = msg_base(snac, "Undo", "@object", snac->actor, "@now", object);
const char *to;
msg = xs_dict_append(msg, "to", xs_dict_get(object, "object")); if (xs_type(object) == XSTYPE_DICT && (to = xs_dict_get(object, "object")))
msg = xs_dict_append(msg, "to", to);
return msg; return msg;
} }