Couple of srvx updates.

[irc/evilnet/x3.git] / src / modcmd.c

diff --git a/src/modcmd.c b/src/modcmd.c
index f3261ea9ad3f57169e2d2ad7607691229dd18fb2..4103a3c302effb15fda7ea0bf9e8f92a7134f128 100644 (file)
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -1031,7 +1031,7 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, const char *text, in
 }
 
 void
-modcmd_chanmsg(struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot, unsigned int is_notice) {
+modcmd_chanmsg(struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot, unsigned int is_notice, UNUSED_ARG(void *extra)) {
     struct service *service;
     if (!(service = dict_find(services, bot->nick, NULL)))
         return;
@@ -1278,20 +1278,24 @@ service_recheck_bindings(struct service *service, struct module *module) {
 }
 
 static svccmd_unbind_func_t *suf_list;
+static void **suf_list_extra;
 unsigned int suf_size, suf_used;
 
 void
-reg_svccmd_unbind_func(svccmd_unbind_func_t handler) {
+reg_svccmd_unbind_func(svccmd_unbind_func_t handler, void *extra) {
     if (suf_used == suf_size) {
         if (suf_size) {
             suf_size <<= 1;
             suf_list = realloc(suf_list, suf_size*sizeof(svccmd_unbind_func_t));
+            suf_list_extra = realloc(suf_list_extra, suf_size*sizeof(void*));
         } else {
             suf_size = 8;
             suf_list = malloc(suf_size*sizeof(svccmd_unbind_func_t));
+            suf_list_extra = malloc(suf_size*sizeof(void*));
         }
     }
-    suf_list[suf_used++] = handler;
+    suf_list[suf_used] = handler;
+    suf_list_extra[suf_used++] = extra;
 }
 
 static MODCMD_FUNC(cmd_unbind) {
@@ -1324,7 +1328,7 @@ static MODCMD_FUNC(cmd_unbind) {
     }
 
     for (ii=0; ii<suf_used; ii++)
-        suf_list[ii](bound);
+        suf_list[ii](bound, suf_list_extra[ii]);
     /* If this command binding is removing itself, we must take care
      * not to dereference it after the dict_remove.
      */
@@ -1937,7 +1941,7 @@ static MODCMD_FUNC(cmd_service_trigger) {
         return 1;
     }
     if (service->trigger)
-        reg_chanmsg_func(service->trigger, NULL, NULL);
+        reg_chanmsg_func(service->trigger, NULL, NULL, NULL);
     if (!irccasecmp(argv[2], "none") || !irccasecmp(argv[2], "remove")) {
         service->trigger = 0;
         reply("MCMSG_REMOVED_TRIGGER", service->bot->nick);
@@ -1946,7 +1950,7 @@ static MODCMD_FUNC(cmd_service_trigger) {
         return 1;
     } else {
         service->trigger = argv[2][0];
-        reg_chanmsg_func(service->trigger, service->bot, modcmd_chanmsg);
+        reg_chanmsg_func(service->trigger, service->bot, modcmd_chanmsg, NULL);
         reply("MCMSG_NEW_TRIGGER", service->bot->nick, service->trigger);
     }
     return 1;
@@ -2066,7 +2070,7 @@ static MODCMD_FUNC(cmd_tell) {
 }
 
 void
-modcmd_nick_change(struct userNode *user, const char *old_nick) {
+modcmd_nick_change(struct userNode *user, const char *old_nick, UNUSED_ARG(void *extra)) {
     struct service *svc;
     if (!(svc = dict_find(services, old_nick, NULL)))
         return;
@@ -2075,11 +2079,13 @@ modcmd_nick_change(struct userNode *user, const char *old_nick) {
 }
 
 void
-modcmd_cleanup(void) {
+modcmd_cleanup(UNUSED_ARG(void* extra)) {
     dict_delete(services);
     dict_delete(modules);
     if (suf_list)
         free(suf_list);
+    if (suf_list_extra)
+        free(suf_list_extra);
 }
 
 static void
@@ -2146,6 +2152,8 @@ modcmd_saxdb_write(struct saxdb_context *ctx) {
     saxdb_start_record(ctx, "bots", 1);
     for (it = dict_first(services); it; it = iter_next(it)) {
         char buff[16];
+        char modes[32];
+
         service = iter_data(it);
         saxdb_start_record(ctx, service->bot->nick, 1);
         if (service->trigger) {
@@ -2155,6 +2163,10 @@ modcmd_saxdb_write(struct saxdb_context *ctx) {
         }
         saxdb_write_string(ctx, "description", service->bot->info);
         saxdb_write_string(ctx, "hostname", service->bot->hostname);
+        if (service->bot->modes) {
+            irc_user_modes(service->bot, modes, sizeof(modes));
+            saxdb_write_string(ctx, "modes", modes);
+        }
         if (service->privileged)
             saxdb_write_string(ctx, "privileged", "1");
         saxdb_end_record(ctx);
@@ -2239,7 +2251,7 @@ modcmd_load_bots(struct dict *db, int default_nick) {
     for (it = dict_first(db); it; it = iter_next(it)) {
         struct record_data *rd;
         struct service *svc;
-        const char *nick, *desc, *hostname;
+        const char *nick, *desc, *hostname, *modes;
 
         rd = iter_data(it);
         if (rd->type != RECDB_OBJECT) {
@@ -2256,9 +2268,10 @@ modcmd_load_bots(struct dict *db, int default_nick) {
         svc = service_find(nick);
         desc = database_get_data(rd->d.object, "description", RECDB_QSTRING);
         hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING);
+        modes = database_get_data(rd->d.object, "modes", RECDB_QSTRING);
         if (desc) {
             if (!svc)
-                svc = service_register(AddLocalUser(nick, nick, hostname, desc, NULL));
+                svc = service_register(AddLocalUser(nick, nick, hostname, desc, modes));
             else if (hostname)
                 strcpy(svc->bot->hostname, hostname);
             desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING);
@@ -2283,8 +2296,8 @@ modcmd_init(void) {
     dict_set_free_data(modules, free_module);
     services = dict_new();
     dict_set_free_data(services, free_service);
-    reg_nick_change_func(modcmd_nick_change);
-    reg_exit_func(modcmd_cleanup);
+    reg_nick_change_func(modcmd_nick_change, NULL);
+    reg_exit_func(modcmd_cleanup, NULL);
     conf_register_reload(modcmd_conf_read);
 
     modcmd_module = module_register("modcmd", MAIN_LOG, "modcmd.help", modcmd_expand);
@@ -2595,7 +2608,7 @@ modcmd_finalize(void) {
     for (it = dict_first(services); it; it = iter_next(it)) {
         struct service *svc = iter_data(it);
         if (svc->trigger)
-            reg_chanmsg_func(svc->trigger, svc->bot, modcmd_chanmsg);
+            reg_chanmsg_func(svc->trigger, svc->bot, modcmd_chanmsg, NULL);
     }
 
     /* Resolve command rule-templates. */