commit 1203080
default
·
2026-08-26 06:09:07 +0000 UTC
parent d7fc3d9
Use snac_op in list_members().
5 files changed,
+14,
-14
M
data.c
+4,
-4
1@@ -2621,7 +2621,7 @@ xs_list *list_timeline(snac *user, const char *list, int skip, int show)
2 }
3
4
5-xs_val *list_members(snac *user, const char *list, const char *actor_md5, int op)
6+xs_val *list_members(snac *user, const char *list, const char *actor_md5, snac_op op)
7 /* list member management */
8 {
9 xs_val *l = NULL;
10@@ -2635,12 +2635,12 @@ xs_val *list_members(snac *user, const char *list, const char *actor_md5, int op
11 xs *fn = xs_fmt("%s/list/%s.lst", user->basedir, list);
12
13 switch (op) {
14- case 0: /** list members **/
15+ case OP_LIST: /** list members **/
16 l = index_list(fn, XS_ALL);
17
18 break;
19
20- case 1: /** append actor to list **/
21+ case OP_ADD: /** append actor to list **/
22 if (xs_is_string(actor_md5) && xs_is_hex(actor_md5)) {
23 if (!index_in_md5(fn, actor_md5))
24 index_add_md5(fn, actor_md5);
25@@ -2648,7 +2648,7 @@ xs_val *list_members(snac *user, const char *list, const char *actor_md5, int op
26
27 break;
28
29- case 2: /** delete actor from list **/
30+ case OP_DEL: /** delete actor from list **/
31 if (xs_is_string(actor_md5) && xs_is_hex(actor_md5))
32 index_del_md5(fn, actor_md5);
33
M
main.c
+3,
-3
1@@ -392,7 +392,7 @@ int main(int argc, char *argv[])
2 xs *lid = list_maint(&snac, url, 4);
3
4 if (lid != NULL) {
5- xs *lcont = list_members(&snac, lid, NULL, 0);
6+ xs *lcont = list_members(&snac, lid, NULL, OP_LIST);
7 const char *md5;
8
9 xs_list_foreach(lcont, md5) {
10@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
11 if (valid_status(webfinger_request(account, &actor, &uid))) {
12 xs *md5 = xs_md5_hex(actor, strlen(actor));
13
14- list_members(&snac, lid, md5, 1);
15+ list_members(&snac, lid, md5, OP_ADD);
16 printf("Actor %s (%s) added to list '%s' (%s)\n", actor, uid, url, lid);
17 }
18 else
19@@ -471,7 +471,7 @@ int main(int argc, char *argv[])
20 if (lid != NULL) {
21 xs *md5 = xs_md5_hex(account, strlen(account));
22
23- list_members(&snac, lid, md5, 2);
24+ list_members(&snac, lid, md5, OP_DEL);
25 printf("Actor %s deleted from list '%s' (%s)\n", account, url, lid);
26 }
27 else
+4,
-4
1@@ -1795,7 +1795,7 @@ xs_list *mastoapi_account_lists(snac *user, const char *uid)
2 const char *list_id = xs_list_get(li, 0);
3 const char *list_title = xs_list_get(li, 1);
4 if (uid) {
5- xs *users = list_members(user, list_id, NULL, 0);
6+ xs *users = list_members(user, list_id, NULL, OP_LIST);
7 if (xs_list_in(users, actor_md5) == -1)
8 continue;
9 }
10@@ -2527,7 +2527,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
11 p = xs_list_get(l, -2);
12
13 if (p && xs_is_hex(p)) {
14- xs *actors = list_members(&snac1, p, NULL, 0);
15+ xs *actors = list_members(&snac1, p, NULL, OP_LIST);
16 xs *out = xs_list_new();
17 int c = 0;
18 const char *v;
19@@ -3843,7 +3843,7 @@ int mastoapi_post_handler(const xs_dict *req, const char *q_path,
20 const char *v;
21
22 while (xs_list_next(accts, &v, &c)) {
23- list_members(&snac, id, v, 1);
24+ list_members(&snac, id, v, OP_ADD);
25 }
26
27 xs *out = xs_dict_new();
28@@ -4052,7 +4052,7 @@ int mastoapi_delete_handler(const xs_dict *req, const char *q_path,
29 const char *v;
30
31 while (xs_list_next(accts, &v, &c)) {
32- list_members(&snac, p, v, 2);
33+ list_members(&snac, p, v, OP_DEL);
34 }
35 }
36 else {
M
snac.h
+1,
-1
1@@ -262,7 +262,7 @@ xs_list *tag_search(const char *tag, int skip, int show);
2 xs_val *list_maint(snac *user, const char *list, int op);
3 xs_str *list_timeline_fn(snac *user, const char *list);
4 xs_list *list_timeline(snac *user, const char *list, int skip, int show);
5-xs_val *list_members(snac *user, const char *list_id, const char *actor_md5, int op);
6+xs_val *list_members(snac *user, const char *list_id, const char *actor_md5, snac_op op);
7 void list_distribute(snac *user, const char *who, const xs_dict *post);
8
9 int actor_add(const char *actor, const xs_dict *msg);
M
utils.c
+2,
-2
1@@ -705,7 +705,7 @@ void export_csv(snac *user)
2 const char *lid = xs_list_get(li, 0);
3 const char *ltitle = xs_list_get(li, 1);
4
5- xs *actors = list_members(user, lid, NULL, 0);
6+ xs *actors = list_members(user, lid, NULL, OP_LIST);
7 const char *md5;
8
9 xs_list_foreach(actors, md5) {
10@@ -935,7 +935,7 @@ void import_list_csv(snac *user, const char *ifn)
11 if (valid_status(webfinger_request(acct, &url, &uid))) {
12 xs *actor_md5 = xs_md5_hex(url, strlen(url));
13
14- list_members(user, list_id, actor_md5, 1);
15+ list_members(user, list_id, actor_md5, OP_ADD);
16 snac_log(user, xs_fmt("Added %s to list %s", url, lname));
17
18 if (!following_check(user, url)) {