commit d7fc3d9
default
·
2026-08-26 06:05:16 +0000 UTC
parent 48aba53
Use snac_op in grave().
5 files changed,
+13,
-10
+2,
-2
1@@ -3951,7 +3951,7 @@ int activitypub_get_handler(const xs_dict *req, const char *q_path,
2 uid = xs_list_get(l, 1);
3 if (!user_open(&snac, uid)) {
4 /* invalid user */
5- status = grave(uid, 0) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
6+ status = grave(uid, OP_CHECK) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
7 srv_debug(1, xs_fmt("activitypub_get_handler bad user %s %d", uid, status));
8 return status;
9 }
10@@ -4151,7 +4151,7 @@ int activitypub_post_handler(const xs_dict *req, const char *q_path,
11 const char *uid = xs_list_get(l, 1);
12 if (!user_open(&snac, uid)) {
13 /* invalid user */
14- status = grave(uid, 0) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
15+ status = grave(uid, OP_CHECK) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
16 srv_debug(1, xs_fmt("activitypub_post_handler bad user %s %d", uid, status));
17 return status;
18 }
M
data.c
+7,
-4
1@@ -3329,7 +3329,7 @@ int instance_failure(const char *url, snac_op op)
2 }
3
4
5-int grave(const char *objid, int op)
6+int grave(const char *objid, snac_op op)
7 /* the graveyeard of deleted objects */
8 {
9 int ret = 0;
10@@ -3339,11 +3339,11 @@ int grave(const char *objid, int op)
11 FILE *f;
12
13 switch (op) {
14- case 0: /** check **/
15+ case OP_CHECK: /** check **/
16 ret = mtime(fn) > 0.0 ? 1 : 0;
17 break;
18
19- case 1: /** add **/
20+ case OP_ADD: /** add **/
21 mkdirx(dir);
22
23 if ((f = fopen(fn, "w")) != NULL) {
24@@ -3353,9 +3353,12 @@ int grave(const char *objid, int op)
25
26 break;
27
28- case 2: /** del **/
29+ case OP_DEL: /** del **/
30 unlink(fn);
31 break;
32+
33+ default:
34+ break;
35 }
36
37 return ret;
M
html.c
+1,
-1
1@@ -4717,7 +4717,7 @@ int html_get_handler(const xs_dict *req, const char *q_path,
2
3 if (!uid || !user_open(&snac, uid)) {
4 /* invalid user */
5- status = grave(uid, 0) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
6+ status = grave(uid, OP_CHECK) ? HTTP_STATUS_GONE : HTTP_STATUS_NOT_FOUND;
7 srv_debug(2, xs_fmt("html_get_handler bad user '%s' %d", xs_or(uid, "(null)"), status));
8 return status;
9 }
M
snac.h
+1,
-1
1@@ -311,7 +311,7 @@ xs_list *content_search(snac *user, const char *regex,
2 int actor_failure(const char *actor, snac_op op);
3 int instance_failure(const char *url, snac_op op);
4
5-int grave(const char *objid, int op);
6+int grave(const char *objid, snac_op op);
7
8 void enqueue_input(snac *snac, const xs_dict *msg, const xs_dict *req, int retries);
9 void enqueue_shared_input(const xs_dict *msg, const xs_dict *req, int retries);
M
utils.c
+2,
-2
1@@ -372,7 +372,7 @@ int adduser(const char *uid)
2 }
3
4 /* remove the grave */
5- grave(uid, 2);
6+ grave(uid, OP_DEL);
7
8 printf("\nUser password is %s\n", pwd);
9
10@@ -467,7 +467,7 @@ int deluser(snac *user)
11 }
12 }
13
14- grave(user->uid, 1);
15+ grave(user->uid, OP_ADD);
16
17 rm_rf(user->basedir);
18