X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/b1bf690d5e16c7f79d3ec308ffdc705e007ce6e5..cde20a3f04531cb55f78fe6d7e609612f8041b33:/src/modcmd.c

diff --git a/src/modcmd.c b/src/modcmd.c
index abd685f..3226327 100644
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -57,6 +57,7 @@ static const struct message_entry msgtab[] = {
     { "MCMSG_COMMAND_ALIASES", "%s is an alias for: %s" },
     { "MCMSG_HELP_COMMAND_ALIAS", "$uAlias for:$u %s" },
     { "MCMSG_HELP_COMMAND_HEADER", "Command help for: $b%s$b" },
+    { "MCMSG_HELP_COMMAND_UNKNOWN", "No help available for that command." },
     { "MCMSG_HELP_TOPIC_HEADER",   "Help topic: $b%s$b" },
     { "MCMSG_HELP_DIVIDER", "=---------------------------------------=" },
     { "MCMSG_HELP_FOOTER",  "=------------- End of Help -------------=" },
@@ -254,7 +255,7 @@ add_pending_template(struct svccmd *cmd, const char *target) {
     pending_templates = pending;
 }
 
-static struct svccmd *
+struct svccmd *
 svccmd_resolve_name(struct svccmd *origin, const char *name) {
     char *sep, svcname[MAXLEN];
 
@@ -755,7 +756,7 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo
             slvl = LOG_COMMAND;
         /* Unsplit argv after running the function to get the benefit
          * of any mangling/hiding done by the commands. */
-        log_audit(cmd->command->parent->clog, slvl, user, service->bot, channel_name, ((flags & MODCMD_LOG_HOSTMASK) ? AUDIT_HOSTMASK : 0), unsplit_string(argv, argc, NULL));
+        log_audit(cmd->command->parent->clog, slvl, user, service->bot, channel_name, AUDIT_HOSTMASK, unsplit_string(argv, argc, NULL));
     }
     return 1;
 }
@@ -783,12 +784,36 @@ svccmd_send_help_brief(struct userNode *user, struct userNode *bot, struct svccm
     return r;
 }
 
+int is_joiner(struct svccmd *cmd)
+{
+    if(cmd->command->name)
+    {
+        if(strcasecmp("joiner", cmd->command->name))
+            return(0);
+        else
+            return(1);
+    }
+    return(0);
+/*
+    if(cmd->alias.used)
+    {
+        char alias_text[MAXLEN];
+        unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text);
+        if(strcasecmp("joiner", alias_text))
+            return(0);
+        else
+            return(1);
+    }
+*/
+}
+
 int
 svccmd_send_help(struct userNode *user, struct service *service, const char *topic) {
     struct module *module;
     struct svccmd *cmd;
     char cmdname[MAXLEN];
-    unsigned int nn;
+    unsigned int nn, ii;
+    int helpsent = 0;
 
     /* If there is no topic show the index */
     if (!topic)
@@ -798,12 +823,12 @@ svccmd_send_help(struct userNode *user, struct service *service, const char *top
             cmdname[nn] = toupper(topic[nn]);
     cmdname[nn] = 0;
 
-    /* If there is a command 'topic', send command help for the command */
-    if ((cmd = dict_find(service->commands, topic, NULL)))
+    /* If there is a command 'topic', send command help for the command (unless its bound to JOINER) */
+    if ((cmd = dict_find(service->commands, topic, NULL)) && !is_joiner(cmd))
     {
         send_message(user, service->bot, "MCMSG_HELP_COMMAND_HEADER", cmdname);
         send_message(user, service->bot, "MCMSG_HELP_DIVIDER");
-        send_help(user, service->bot, cmd->command->parent->helpfile, cmd->name);
+        helpsent = send_help(user, service->bot, cmd->command->parent->helpfile, cmd->name);
 
         /* Show if its an alias, or a binding of another command */
         if (cmd->alias.used) 
@@ -811,27 +836,46 @@ svccmd_send_help(struct userNode *user, struct service *service, const char *top
             char alias_text[MAXLEN];
             unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text);
             send_message(user, service->bot, "MCMSG_HELP_COMMAND_ALIAS", alias_text);
+            /* If send_help above didnt work, try again with the referenced command.. */
+            if(!helpsent)
+                helpsent = send_help(user, service->bot, cmd->command->parent->helpfile, alias_text);
         }
         else if(cmd->command->name && strcasecmp(cmd->command->name, cmd->name))
         {
             send_message(user, service->bot, "MCMSG_HELP_COMMAND_ALIAS", cmd->command->name);
+            /* If send_help above didnt work, try again with the referenced command.. */
+            if(!helpsent)
+                helpsent = send_help(user, service->bot, cmd->command->parent->helpfile, cmd->command->name);
         } 
+        /* If send_help still couldnt find it, tell them sorry */
+        if(!helpsent)
+            send_message(user, service->bot, "MCMSG_HELP_COMMAND_UNKNOWN");
         send_message(user, service->bot, "MCMSG_HELP_FOOTER");
         return true;
     }
     else /* look for topic in the help files loaded to this nick/service */
     {
-        /* Check for non command help in first primary help file, then 
-         * check for help for this on another service and provide a tip */
-            module = service->modules.list[0];
-            if (module->helpfile && dict_find(module->helpfile->db, topic, NULL))
+        /* Check for non command help in first primary help file, then next and so on */ 
+        /* Note - we need to think about default bindings. see opserv.helpfiles */
+            for(ii = 0; ii < service->modules.used; ii++)
             {
-
-                send_message(user, service->bot, "MCMSG_HELP_TOPIC_HEADER", cmdname);
-                send_message(user, service->bot, "MCMSG_HELP_DIVIDER");
-                send_help(user, service->bot, module->helpfile, topic);
-                send_message(user, service->bot, "MCMSG_HELP_FOOTER");
-                return true;
+                module = service->modules.list[ii];
+                if(!module->helpfile)
+                    continue;
+                if(dict_find(module->helpfile->db, topic, NULL))
+                {
+                    if (module->helpfile && dict_find(module->helpfile->db, topic, NULL))
+                    {
+
+                        send_message(user, service->bot, "MCMSG_HELP_TOPIC_HEADER", cmdname);
+                        send_message(user, service->bot, "MCMSG_HELP_DIVIDER");
+                        /* This should never fail but maybe if something is odd? */
+                        if(!send_help(user, service->bot, module->helpfile, topic))
+                            send_message(user, service->bot, "MSG_TOPIC_UNKNOWN");
+                        send_message(user, service->bot, "MCMSG_HELP_FOOTER");
+                        return true;
+                    }
+                }
             }
     }
     /* Otherwise say we cant find it */
@@ -920,6 +964,9 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int serv
              */
             snprintf(response, sizeof(response), "\x01VERSION %s\x01", PACKAGE_STRING);
             irc_notice_user(bot, user, response);
+        } else if (!irccasecmp(text, "GENDER")) {
+             snprintf(response, sizeof(response), "\x01GENDER ummm im still deciding\x01");
+             irc_notice_user(bot, user, response);
         }
         return;
     }
@@ -1254,8 +1301,8 @@ static MODCMD_FUNC(cmd_readhelp) {
     stop.tv_sec -= start.tv_sec;
     stop.tv_usec -= start.tv_usec;
     if (stop.tv_usec < 0) {
-	stop.tv_sec -= 1;
-	stop.tv_usec += 1000000;
+        stop.tv_sec -= 1;
+        stop.tv_usec += 1000000;
     }
     reply("MCMSG_HELPFILE_READ", module->name, stop.tv_sec, stop.tv_usec/1000);
     return 1;
@@ -1279,8 +1326,8 @@ static MODCMD_FUNC(cmd_timecmd) {
     stop.tv_sec -= start.tv_sec;
     stop.tv_usec -= start.tv_usec;
     if (stop.tv_usec < 0) {
-	stop.tv_sec -= 1;
-	stop.tv_usec += 1000000;
+        stop.tv_sec -= 1;
+        stop.tv_usec += 1000000;
     }
     reply("MCMSG_COMMAND_TIME", cmd_text, stop.tv_sec, stop.tv_usec);
     return 1;
@@ -1483,17 +1530,17 @@ static MODCMD_FUNC(cmd_god) {
                 reply("MCMSG_ALREADY_HELPING");
                 return 0;
             }
-	    helping = 1;
+            helping = 1;
         } else if (disabled_string(argv[1])) {
             if (!HANDLE_FLAGGED(user->handle_info, HELPING)) {
                 reply("MCMSG_ALREADY_NOT_HELPING");
                 return 0;
             }
-	    helping = 0;
+            helping = 0;
         } else {
             reply("MSG_INVALID_BINARY", argv[1]);
             return 0;
-	}
+        }
     } else {
         helping = !IsHelping(user);
     }
@@ -1896,13 +1943,32 @@ static MODCMD_FUNC(cmd_version) {
      * command or its accessibility to normal IRC users, except to add
      * copyright information pertaining to changes you make to X3.
      */
-    send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"$b (Based on srvx 1.3), Built: "__DATE__", "__TIME__".");
-    send_message_type(4, user, cmd->parent->bot, "("CVS_VERSION")");
-    send_message_type(4, user, cmd->parent->bot, "Copyright 2000-2005 srvx Development Team.");
-    send_message_type(4, user, cmd->parent->bot, "Copyright 2004-2005 X3 Development Team.");
+
+    char *svn = NULL, *svnver = NULL, *svndate = NULL, *v = 0, ver[MAXLEN];
+    int vc = 0;
+
+    strcpy(ver, CVS_VERSION);
+    for (svn = x3_strtok(&v, ver, " "); svn;
+         svn = x3_strtok(&v, 0, " ")) {
+        if (vc == 2)
+            svnver = svn;
+        else if (vc == 3)
+            svndate = svn;
+        vc++;
+    }
+
+    send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"+[%s %s]$b (Based on srvx 1.3), Built: "__DATE__", "__TIME__".", svnver, svndate);
+    send_message_type(4, user, cmd->parent->bot, "$b$b");
+    send_message_type(4, user, cmd->parent->bot, "Copyright 2000-2006 srvx Development Team.");
+    send_message_type(4, user, cmd->parent->bot, "Copyright 2004-2006 X3 Development Team.");
+    send_message_type(4, user, cmd->parent->bot, "$b$b");
     send_message_type(4, user, cmd->parent->bot, "The srvx 1.3 Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.");
     send_message_type(4, user, cmd->parent->bot, "The X3 Development Team includes Alex Schumann, Reed Loden, Neil Spierling.");
-    send_message_type(4, user, cmd->parent->bot, "The X3 Development Team can be reached at http://sf.net/projects/x2serv/ or in #evilnet on irc.afternet.org.");
+    send_message_type(4, user, cmd->parent->bot, "The X3 Development Team can be reached at http://sourceforge.net/projects/evilnet or in #evilnet on irc.afternet.org.");
+    send_message_type(4, user, cmd->parent->bot, "$b$b");
+    send_message_type(4, user, cmd->parent->bot, "Thanks goes to Adrian M (thiefmaster), Joe Hansche (joeatrr) and to any other people who have contributed to X3.");
+    send_message_type(4, user, cmd->parent->bot, "This program is free software; see COPYING in the distribution.");
+
     return 1;
 }