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

More migration work.

Browse source
This commit is contained in:
default 2024-10-08 17:37:15 +02:00
parent 26a808c891
commit 387964944a
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
activitypub.c
View file

@ -419,7 +419,7 @@ int send_to_inbox(snac *snac, const xs_str *inbox, const xs_dict *msg,
} }
xs_str *get_actor_inbox(const char *actor) xs_str *get_actor_inbox(const char *actor, int shared)
/* gets an actor's inbox */ /* gets an actor's inbox */
{ {
xs *data = NULL; xs *data = NULL;
@ -427,7 +427,7 @@ xs_str *get_actor_inbox(const char *actor)
if (valid_status(actor_request(NULL, actor, &data))) { if (valid_status(actor_request(NULL, actor, &data))) {
/* try first endpoints/sharedInbox */ /* try first endpoints/sharedInbox */
if ((v = xs_dict_get(data, "endpoints"))) if (shared && (v = xs_dict_get(data, "endpoints")))
v = xs_dict_get(v, "sharedInbox"); v = xs_dict_get(v, "sharedInbox");
/* try then the regular inbox */ /* try then the regular inbox */
@ -444,7 +444,7 @@ int send_to_actor(snac *snac, const char *actor, const xs_dict *msg,
/* sends a message to an actor */ /* sends a message to an actor */
{ {
int status = HTTP_STATUS_BAD_REQUEST; int status = HTTP_STATUS_BAD_REQUEST;
xs *inbox = get_actor_inbox(actor); xs *inbox = get_actor_inbox(actor, 1);
if (!xs_is_null(inbox)) if (!xs_is_null(inbox))
status = send_to_inbox(snac, inbox, msg, payload, p_size, timeout); status = send_to_inbox(snac, inbox, msg, payload, p_size, timeout);
@ -2290,7 +2290,7 @@ void process_user_queue_item(snac *snac, xs_dict *q_item)
/* iterate the recipients */ /* iterate the recipients */
c = 0; c = 0;
while (xs_list_next(rcpts, &actor, &c)) { while (xs_list_next(rcpts, &actor, &c)) {
xs *inbox = get_actor_inbox(actor); xs *inbox = get_actor_inbox(actor, 1);
if (inbox != NULL) { if (inbox != NULL) {
/* add to the set and, if it's not there, send message */ /* add to the set and, if it's not there, send message */
@ -2699,14 +2699,18 @@ int migrate_account(snac *user)
xs *move = msg_move(user, new_account); xs *move = msg_move(user, new_account);
xs *fwers = follower_list(user); xs *fwers = follower_list(user);
/* snac_log(user, xs_fmt("WORK IN PROGRESS - ANYTHING CAN HAPPEN"));
xs_json_dump(move, 4, stdout);
printf("\n");
xs_json_dump(fwers, 4, stdout);
printf("\n");
*/
printf("WORK IN PROGRESS - NOT YET USABLE (BUT HARMLESS)\n"); const char *actor;
xs_list_foreach(fwers, actor) {
/* get the actor inbox, excluding the shared one */
xs *inbox = get_actor_inbox(actor, 0);
if (xs_is_null(inbox))
snac_log(user, xs_fmt("migrate_account: cannot get inbox for actor %s", actor));
else
enqueue_output(user, move, inbox, 0, 0);
}
return 0; return 0;
} }

2
data.c
View file

@ -2948,7 +2948,7 @@ void enqueue_output_by_actor(snac *snac, const xs_dict *msg,
const xs_str *actor, int retries) const xs_str *actor, int retries)
/* enqueues an output message for an actor */ /* enqueues an output message for an actor */
{ {
xs *inbox = get_actor_inbox(actor); xs *inbox = get_actor_inbox(actor, 1);
if (!xs_is_null(inbox)) if (!xs_is_null(inbox))
enqueue_output(snac, msg, inbox, retries, 0); enqueue_output(snac, msg, inbox, retries, 0);

2
snac.h
View file

@ -322,7 +322,7 @@ int send_to_inbox_raw(const char *keyid, const char *seckey,
xs_val **payload, int *p_size, int timeout); xs_val **payload, int *p_size, int timeout);
int send_to_inbox(snac *snac, const xs_str *inbox, const xs_dict *msg, int send_to_inbox(snac *snac, const xs_str *inbox, const xs_dict *msg,
xs_val **payload, int *p_size, int timeout); xs_val **payload, int *p_size, int timeout);
xs_str *get_actor_inbox(const char *actor); xs_str *get_actor_inbox(const char *actor, int shared);
int send_to_actor(snac *snac, const char *actor, const xs_dict *msg, int send_to_actor(snac *snac, const char *actor, const xs_dict *msg,
xs_val **payload, int *p_size, int timeout); xs_val **payload, int *p_size, int timeout);
int is_msg_public(const xs_dict *msg); int is_msg_public(const xs_dict *msg);