Răsfoiți Sursa

Use snac_op in list_members().

default 3 săptămâni în urmă
părinte
comite
1203080748
5 a modificat fișierele cu 14 adăugiri și 14 ștergeri
  1. 4 4
      data.c
  2. 3 3
      main.c
  3. 4 4
      mastoapi.c
  4. 1 1
      snac.h
  5. 2 2
      utils.c

+ 4 - 4
data.c

@@ -2621,7 +2621,7 @@ xs_list *list_timeline(snac *user, const char *list, int skip, int show)
 }
 
 
-xs_val *list_members(snac *user, const char *list, const char *actor_md5, int op)
+xs_val *list_members(snac *user, const char *list, const char *actor_md5, snac_op op)
 /* list member management */
 {
     xs_val *l = NULL;
@@ -2635,12 +2635,12 @@ xs_val *list_members(snac *user, const char *list, const char *actor_md5, int op
     xs *fn = xs_fmt("%s/list/%s.lst", user->basedir, list);
 
     switch (op) {
-    case 0: /** list members **/
+    case OP_LIST: /** list members **/
         l = index_list(fn, XS_ALL);
 
         break;
 
-    case 1: /** append actor to list **/
+    case OP_ADD: /** append actor to list **/
         if (xs_is_string(actor_md5) && xs_is_hex(actor_md5)) {
             if (!index_in_md5(fn, actor_md5))
                 index_add_md5(fn, actor_md5);
@@ -2648,7 +2648,7 @@ xs_val *list_members(snac *user, const char *list, const char *actor_md5, int op
 
         break;
 
-    case 2: /** delete actor from list **/
+    case OP_DEL: /** delete actor from list **/
         if (xs_is_string(actor_md5) && xs_is_hex(actor_md5))
             index_del_md5(fn, actor_md5);
 

+ 3 - 3
main.c

@@ -392,7 +392,7 @@ int main(int argc, char *argv[])
         xs *lid = list_maint(&snac, url, 4);
 
         if (lid != NULL) {
-            xs *lcont = list_members(&snac, lid, NULL, 0);
+            xs *lcont = list_members(&snac, lid, NULL, OP_LIST);
             const char *md5;
 
             xs_list_foreach(lcont, md5) {
@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
                 if (valid_status(webfinger_request(account, &actor, &uid))) {
                     xs *md5 = xs_md5_hex(actor, strlen(actor));
 
-                    list_members(&snac, lid, md5, 1);
+                    list_members(&snac, lid, md5, OP_ADD);
                     printf("Actor %s (%s) added to list '%s' (%s)\n", actor, uid, url, lid);
                 }
                 else
@@ -471,7 +471,7 @@ int main(int argc, char *argv[])
             if (lid != NULL) {
                 xs *md5 = xs_md5_hex(account, strlen(account));
 
-                list_members(&snac, lid, md5, 2);
+                list_members(&snac, lid, md5, OP_DEL);
                 printf("Actor %s deleted from list '%s' (%s)\n", account, url, lid);
             }
             else

+ 4 - 4
mastoapi.c

@@ -1795,7 +1795,7 @@ xs_list *mastoapi_account_lists(snac *user, const char *uid)
         const char *list_id    = xs_list_get(li, 0);
         const char *list_title = xs_list_get(li, 1);
         if (uid) {
-            xs *users = list_members(user, list_id, NULL, 0);
+            xs *users = list_members(user, list_id, NULL, OP_LIST);
             if (xs_list_in(users, actor_md5) == -1)
                 continue;
         }
@@ -2527,7 +2527,7 @@ int mastoapi_get_handler(const xs_dict *req, const char *q_path,
                     p = xs_list_get(l, -2);
 
                     if (p && xs_is_hex(p)) {
-                        xs *actors = list_members(&snac1, p, NULL, 0);
+                        xs *actors = list_members(&snac1, p, NULL, OP_LIST);
                         xs *out = xs_list_new();
                         int c = 0;
                         const char *v;
@@ -3843,7 +3843,7 @@ int mastoapi_post_handler(const xs_dict *req, const char *q_path,
                     const char *v;
 
                     while (xs_list_next(accts, &v, &c)) {
-                        list_members(&snac, id, v, 1);
+                        list_members(&snac, id, v, OP_ADD);
                     }
 
                     xs *out = xs_dict_new();
@@ -4052,7 +4052,7 @@ int mastoapi_delete_handler(const xs_dict *req, const char *q_path,
                     const char *v;
 
                     while (xs_list_next(accts, &v, &c)) {
-                        list_members(&snac, p, v, 2);
+                        list_members(&snac, p, v, OP_DEL);
                     }
                 }
                 else {

+ 1 - 1
snac.h

@@ -262,7 +262,7 @@ xs_list *tag_search(const char *tag, int skip, int show);
 xs_val *list_maint(snac *user, const char *list, int op);
 xs_str *list_timeline_fn(snac *user, const char *list);
 xs_list *list_timeline(snac *user, const char *list, int skip, int show);
-xs_val *list_members(snac *user, const char *list_id, const char *actor_md5, int op);
+xs_val *list_members(snac *user, const char *list_id, const char *actor_md5, snac_op op);
 void list_distribute(snac *user, const char *who, const xs_dict *post);
 
 int actor_add(const char *actor, const xs_dict *msg);

+ 2 - 2
utils.c

@@ -705,7 +705,7 @@ void export_csv(snac *user)
             const char *lid = xs_list_get(li, 0);
             const char *ltitle = xs_list_get(li, 1);
 
-            xs *actors = list_members(user, lid, NULL, 0);
+            xs *actors = list_members(user, lid, NULL, OP_LIST);
             const char *md5;
 
             xs_list_foreach(actors, md5) {
@@ -935,7 +935,7 @@ void import_list_csv(snac *user, const char *ifn)
                     if (valid_status(webfinger_request(acct, &url, &uid))) {
                         xs *actor_md5 = xs_md5_hex(url, strlen(url));
 
-                        list_members(user, list_id, actor_md5, 1);
+                        list_members(user, list_id, actor_md5, OP_ADD);
                         snac_log(user, xs_fmt("Added %s to list %s", url, lname));
 
                         if (!following_check(user, url)) {