added possibility to change default trigger (even for registered channels)

[NeonServV5.git] / src / modcmd.c

diff --git a/src/modcmd.c b/src/modcmd.c
index 058612a2b353cd09887d543c67d5ddf000389947..a23dc7c0b1177391f00764a3b744b40a389a2f91 100644 (file)
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -1,4 +1,4 @@
-/* modcmd.c - NeonServ v5.2
+/* modcmd.c - NeonServ v5.3
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -70,6 +70,7 @@ static const struct default_language_entry msgtab[] = {
     {"MODCMD_ACCESS_DENIED",    "Access denied."},
     {"MODCMD_SUBCOMMANDS",      "Subcommands of %s: %s"}, /* {ARGS: "bot", "ADD, DEL, EDIT"} */
     {"MODCMD_CROSSCHAN",        "You must be in %s (or on its userlist) to use this command."},
+    {"MODCMD_UNKNOWN",          "$b%s$b is an unknown command."}, /* {ARGS: "bla"} */
     {NULL, NULL}
 };
 
@@ -161,8 +162,12 @@ static void handle_command(struct ClientSocket *client, struct UserNode *user, s
         args++;
     }
     struct cmd_binding *cbind;
+    int found_cmd = 0;
     for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) {
         if(cbind->botid == client->botid && (cbind->botid || cbind->clientid == client->clientid) && stricmp(cbind->cmd, message) == 0) {
+            found_cmd = 1;
+            //get a text bot
+            tmp_text_client = get_botwise_prefered_bot(client->botid, (client->botid == 0 ? client->clientid : 0));
             if(cbind->func->func == modcmd_linker) {
                 //links subcommands
                 char command[MAXLEN];
@@ -191,7 +196,7 @@ static void handle_command(struct ClientSocket *client, struct UserNode *user, s
                             subcompos += sprintf(subcommands + subcompos, (subcompos ? ", %s" : "%s"), cbind->cmd + commandlen);
                         }
                     }
-                    reply(tmp_text_client, user, "MODCMD_SUBCOMMANDS", parent_bind->cmd, subcommands);
+                    reply(tmp_text_client, user, "MODCMD_SUBCOMMANDS", parent_bind->cmd, (subcompos ? subcommands : "\1dnone\1d"));
                     break;
                 }
             }
@@ -204,8 +209,6 @@ static void handle_command(struct ClientSocket *client, struct UserNode *user, s
                     break;
                 chan = sent_chan;
             }
-            //get a text bot
-            tmp_text_client = get_botwise_prefered_bot(client->botid, (client->botid == 0 ? client->clientid : 0));
             //parse the arguments...
             char *arga[MAXNUMPARAMS];
             char **argv;
@@ -361,6 +364,8 @@ static void handle_command(struct ClientSocket *client, struct UserNode *user, s
             break;
         }
     }
+    if(!found_cmd && !sent_chan)
+        reply(get_botwise_prefered_bot(client->botid, (client->botid == 0 ? client->clientid : 0)), user, "MODCMD_UNKNOWN", message);
     free(message);
     if(args_buffer)
         free(args_buffer);
@@ -531,6 +536,7 @@ static void got_chanmsg(struct UserNode *user, struct ChanNode *chan, char *mess
     struct ClientSocket *client;
     FD_ZERO(&fds);
     FD_ZERO(&fds2);
+    got_chanmsg_loop1:
     for(client = getBots(SOCKET_FLAG_READY, NULL); client; client = getBots(SOCKET_FLAG_READY, client)) {
         if(isUserOnChan(client->user, chan) && (client->flags & SOCKET_FLAG_PREFERRED) && ((client->botid == 0 && !FD_ISSET(client->clientid, &fds)) || (client->botid && !FD_ISSET(client->botid, &fds2))))  {
             FD_SET(client->clientid, &fds);
@@ -538,16 +544,19 @@ static void got_chanmsg(struct UserNode *user, struct ChanNode *chan, char *mess
             trigger = get_channel_trigger(client->botid, client->clientid, chan);
             if(trigger && stricmplen(message, trigger, strlen(trigger)) == 0) {
                 handle_command(client, user, chan, message + strlen(trigger));
+                goto got_chanmsg_loop1; //Thats really really bad, i know... But we can't count on the "getBots" list anymore after executing a command
             }
         }
     }
+    got_chanmsg_loop2:
     for(client = getBots(SOCKET_FLAG_READY, NULL); client; client = getBots(SOCKET_FLAG_READY, client)) {
         if(isUserOnChan(client->user, chan) && ((client->botid == 0 && !FD_ISSET(client->clientid, &fds)) || (client->botid && !FD_ISSET(client->botid, &fds2)))) {
-            FD_SET(client->botid, &fds);
+            FD_SET(client->clientid, &fds);
             FD_SET(client->botid, &fds2);
             trigger = get_channel_trigger(client->botid, client->clientid, chan);
             if(trigger && stricmplen(message, trigger, strlen(trigger)) == 0) {
                 handle_command(client, user, chan, message + strlen(trigger));
+                goto got_chanmsg_loop2; //Thats really really bad, i know... But we can't count on the "getBots" list anymore after executing a command
             }
         }
     }
@@ -605,6 +614,27 @@ int set_trigger_callback(int botid, trigger_callback_t *func) {
     return 1;
 }
 
+int flush_trigger_cache(int botid, int clientid) {
+    struct ChanNode *chan;
+    struct trigger_cache *trigger, *last;
+    for(chan = getAllChans(NULL); chan; chan = getAllChans(chan)) {
+        last = NULL;
+        for(trigger = chan->trigger; trigger; trigger = trigger->next) {
+            if(trigger->botid == botid && (botid || trigger->clientid == clientid)) {
+                if(last)
+                    last->next = trigger->next;
+                else
+                    chan->trigger = trigger->next;
+                free(trigger->trigger);
+                free(trigger);
+                break;
+            } else
+                last = trigger;
+        }
+    }
+    return 1;
+}
+
 int changeBotwiseChannelTrigger(int botid, int clientid, struct ChanNode *chan, char *new_trigger) {
     struct trigger_cache *trigger;
     for(trigger = chan->trigger; trigger; trigger = trigger->next) {