Merge branch 'master' of https://codeberg.org/grunfink/snac2

1 files changed, 11 insertions, 10 deletions

diff --git a/utils.c b/utils.c
index 9475bd7..8fab2d2 100644
--- a/utils.c
+++ b/utils.c
@@ -372,7 +372,7 @@ int adduser(const char *uid)
     }
 
     /* remove the grave */
-    grave(uid, 2);
+    grave(uid, OP_DEL);
 
     printf("\nUser password is %s\n", pwd);
 
@@ -467,7 +467,7 @@ int deluser(snac *user)
         }
     }
 
-    grave(user->uid, 1);
+    grave(user->uid, OP_ADD);
 
     rm_rf(user->basedir);
 
@@ -698,14 +698,14 @@ void export_csv(snac *user)
     if ((f = fopen(fn, "w")) != NULL) {
         snac_log(user, xs_fmt("Creating %s...", fn));
 
-        xs *lol = list_maint(user, NULL, 0);
+        xs *lol = list_maint(user, NULL, OP_LIST);
         const xs_list *li;
 
         xs_list_foreach(lol, li) {
             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) {
@@ -744,7 +744,7 @@ void export_csv(snac *user)
             webfinger_request_fake(actor, NULL, &uid);
 
             if (xs_is_string(uid))
-                fprintf(f, "%s,%s,false,\n", uid, limited(user, actor, 0) ? "false" : "true");
+                fprintf(f, "%s,%s,false,\n", uid, limited(user, actor, OP_CHECK) ? "false" : "true");
         }
 
         fclose(f);
@@ -927,7 +927,7 @@ void import_list_csv(snac *user, const char *ifn)
 
                 if (lname && acct) {
                     /* create the list */
-                    xs *list_id = list_maint(user, lname, 1);
+                    xs *list_id = list_maint(user, lname, OP_ADD);
 
                     xs *url = NULL;
                     xs *uid = NULL;
@@ -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)) {
@@ -1024,8 +1024,8 @@ static int top_ten_sort(const void *v1, const void *v2)
     const xs_list *l1 = *(const xs_list **)v1;
     const xs_list *l2 = *(const xs_list **)v2;
 
-    const char *c1 = xs_list_get(l1, 3);
-    const char *c2 = xs_list_get(l2, 3);
+    const char *c1 = xs_list_get(l1, 4);
+    const char *c2 = xs_list_get(l2, 4);
 
     return xs_cmp(c2, c1);
 }
@@ -1060,9 +1060,10 @@ xs_list *user_top_ten(snac *user, int count)
         /* get metrics */
         int ls = object_likes_len(id);
         int as = object_announces_len(id);
+        int es = object_emojireacts_len(id);
 
         /* build the entry and convert to list */
-        xs *s = xs_fmt("%s\t%d\t%d\t%010d", id, ls, as, ls + as);
+        xs *s = xs_fmt("%s\t%d\t%d\t%d\t%010d", id, ls, as, es, ls + as + es);
         xs *l = xs_split(s, "\t");
 
         u_list = xs_list_append(u_list, l);