snac2

commit 2d6252bf38779577696ba65996d7025d0439f85c
parent 0a87bfdcb83d2dca610ad8f1adcf9a6ab8e64cf6
Author: Santtu Lakkala <santtu.lakkala@unikie.com>
Date:   Mon, 24 Mar 2025 14:14:35 +0200

Rename argument

Diffstat:
M
data.c
 | 
29
+++++++++++++++--------------

1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/data.c b/data.c
@@ -454,14 +454,15 @@ int user_open_by_md5(snac *snac, const char *md5)
     return 0;
 }
 
-int user_persist(snac *snac, int publish)
+int object_del_by_md5(const char *md5);
+int user_persist(snac *user, int publish)
 /* store user */
 {
     FILE *f;
 
     if (publish) {
         /* check if any of the relevant fields have really changed */
-        if ((f = user_open_file(snac, "user.json", 0)) != NULL) {
+        if ((f = user_open_file(user, "user.json", 0)) != NULL) {
             xs *old = xs_json_load(f);
             fclose(f);
 
@@ -472,7 +473,7 @@ int user_persist(snac *snac, int publish)
 
                 for (int n = 0; fields[n]; n++) {
                     const char *of = xs_dict_get(old, fields[n]);
-                    const char *nf = xs_dict_get(snac->config, fields[n]);
+                    const char *nf = xs_dict_get(user->config, fields[n]);
 
                     if (of == NULL && nf == NULL)
                         continue;
@@ -487,31 +488,31 @@ int user_persist(snac *snac, int publish)
                     publish = 0;
                 else {
                     /* uncache the actor object */
-                    object_del(snac->actor);
+                    object_del_by_md5(user->md5);
                 }
             }
         }
     }
 
-    renameat(snac->basedfd, "user.json", snac->basedfd, "user.json.bak");
+    renameat(user->basedfd, "user.json", user->basedfd, "user.json.bak");
 
-    if ((f = user_open_file(snac, "user.json", 1)) != NULL) {
-        xs_json_dump(snac->config, 4, f);
+    if ((f = user_open_file(user, "user.json", 1)) != NULL) {
+        xs_json_dump(user->config, 4, f);
         fclose(f);
     }
     else
-        renameat(snac->basedfd, "user.json.bak", snac->basedfd, "user.json");
+        renameat(user->basedfd, "user.json.bak", user->basedfd, "user.json");
 
-    history_del(snac, "timeline.html_");
-    timeline_touch(snac);
+    history_del(user, "timeline.html_");
+    timeline_touch(user);
 
     if (publish) {
-        xs *a_msg = msg_actor(snac);
-        xs *u_msg = msg_update(snac, a_msg);
+        xs *a_msg = msg_actor(user);
+        xs *u_msg = msg_update(user, a_msg);
 
-        enqueue_message(snac, u_msg);
+        enqueue_message(user, u_msg);
 
-        enqueue_verify_links(snac);
+        enqueue_verify_links(user);
     }
 
     return 0;