mirror of
https://codeberg.org/grunfink/snac2.git
synced 2024-11-25 14:35:04 +00:00
Don't enqueue a request_replies message if it's already there.
This commit is contained in:
parent
ecde1c219e
commit
b77ef13d2c
3 changed files with 40 additions and 7 deletions
44
data.c
44
data.c
|
@ -1938,10 +1938,33 @@ void enqueue_close_question(snac *user, const char *id, int end_secs)
|
||||||
void enqueue_request_replies(snac *user, const char *id)
|
void enqueue_request_replies(snac *user, const char *id)
|
||||||
/* enqueues a request for the replies of a message */
|
/* enqueues a request for the replies of a message */
|
||||||
{
|
{
|
||||||
|
/* test first if this precise request is already in the queue */
|
||||||
|
xs *queue = user_queue(user);
|
||||||
|
xs_list *p = queue;
|
||||||
|
xs_str *v;
|
||||||
|
|
||||||
|
while (xs_list_iter(&p, &v)) {
|
||||||
|
xs *q_item = queue_get(v);
|
||||||
|
|
||||||
|
if (q_item != NULL) {
|
||||||
|
const char *type = xs_dict_get(q_item, "type");
|
||||||
|
const char *msg = xs_dict_get(q_item, "message");
|
||||||
|
|
||||||
|
if (type && msg && strcmp(type, "request_replies") == 0 && strcmp(msg, id) == 0) {
|
||||||
|
/* don't requeue */
|
||||||
|
snac_debug(user, 0, xs_fmt("enqueue_request_replies already here %s", id));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* not there; enqueue the request with a small delay */
|
||||||
xs *qmsg = _new_qmsg("request_replies", id, 0);
|
xs *qmsg = _new_qmsg("request_replies", id, 0);
|
||||||
char *ntid = xs_dict_get(qmsg, "ntid");
|
xs *ntid = tid(10);
|
||||||
xs *fn = xs_fmt("%s/queue/%s.json", user->basedir, ntid);
|
xs *fn = xs_fmt("%s/queue/%s.json", user->basedir, ntid);
|
||||||
|
|
||||||
|
qmsg = xs_dict_set(qmsg, "ntid", ntid);
|
||||||
|
|
||||||
qmsg = _enqueue_put(fn, qmsg);
|
qmsg = _enqueue_put(fn, qmsg);
|
||||||
|
|
||||||
snac_debug(user, 0, xs_fmt("enqueue_request_replies %s", id));
|
snac_debug(user, 0, xs_fmt("enqueue_request_replies %s", id));
|
||||||
|
@ -2030,16 +2053,13 @@ xs_list *queue(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
xs_dict *dequeue(const char *fn)
|
xs_dict *queue_get(const char *fn)
|
||||||
/* dequeues a message */
|
/* gets a file from a queue */
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
xs_dict *obj = NULL;
|
xs_dict *obj = NULL;
|
||||||
|
|
||||||
if ((f = fopen(fn, "r")) != NULL) {
|
if ((f = fopen(fn, "r")) != NULL) {
|
||||||
/* delete right now */
|
|
||||||
unlink(fn);
|
|
||||||
|
|
||||||
xs *j = xs_readall(f);
|
xs *j = xs_readall(f);
|
||||||
obj = xs_json_loads(j);
|
obj = xs_json_loads(j);
|
||||||
|
|
||||||
|
@ -2050,6 +2070,18 @@ xs_dict *dequeue(const char *fn)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
xs_dict *dequeue(const char *fn)
|
||||||
|
/* dequeues a message */
|
||||||
|
{
|
||||||
|
xs_dict *obj = queue_get(fn);
|
||||||
|
|
||||||
|
if (obj != NULL)
|
||||||
|
unlink(fn);
|
||||||
|
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/** the purge **/
|
/** the purge **/
|
||||||
|
|
||||||
static int _purge_file(const char *fn, time_t mt)
|
static int _purge_file(const char *fn, time_t mt)
|
||||||
|
|
2
main.c
2
main.c
|
@ -279,8 +279,8 @@ int main(int argc, char *argv[])
|
||||||
status = activitypub_request(&snac, url, &data);
|
status = activitypub_request(&snac, url, &data);
|
||||||
|
|
||||||
printf("status: %d\n", status);
|
printf("status: %d\n", status);
|
||||||
if (valid_status(status)) {
|
|
||||||
|
|
||||||
|
if (data != NULL) {
|
||||||
xs *j = xs_json_dumps_pp(data, 4);
|
xs *j = xs_json_dumps_pp(data, 4);
|
||||||
printf("%s\n", j);
|
printf("%s\n", j);
|
||||||
}
|
}
|
||||||
|
|
1
snac.h
1
snac.h
|
@ -170,6 +170,7 @@ int was_question_voted(snac *user, const char *id);
|
||||||
|
|
||||||
xs_list *user_queue(snac *snac);
|
xs_list *user_queue(snac *snac);
|
||||||
xs_list *queue(void);
|
xs_list *queue(void);
|
||||||
|
xs_dict *queue_get(const char *fn);
|
||||||
xs_dict *dequeue(const char *fn);
|
xs_dict *dequeue(const char *fn);
|
||||||
|
|
||||||
void purge(snac *snac);
|
void purge(snac *snac);
|
||||||
|
|
Loading…
Reference in a new issue