/* modcmd.c - Generalized module command support
* Copyright 2002-2004 srvx Development Team
*
- * This file is part of srvx.
+ * This file is part of x3.
*
* srvx is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-//#include "arch-version.h"
+#include "../ChangeLog.X3"
#include "chanserv.h"
#include "conf.h"
#include "modcmd.h"
{ "MCMSG_NO_CHANNEL_BEFORE", "You may not give a channel name before this command." },
{ "MCMSG_NO_PLUS_CHANNEL", "You may not use a +channel with this command." },
{ "MCMSG_COMMAND_ALIASES", "%s is an alias for: %s" },
+ { "MCMSG_HELP_COMMAND_ALIAS", "$uAlias for:$u %s" },
{ "MCMSG_COMMAND_BINDING", "%s is a binding of: %s" },
{ "MCMSG_ALIAS_ERROR", "Error in alias expansion for %s; check the error log for details." },
{ "MCMSG_INTERNAL_COMMAND", "$b%s$b is an internal command and cannot be called directly; please check command bindings." },
{ "channel", MODCMD_REQUIRE_CHANNEL },
{ "chanuser", MODCMD_REQUIRE_CHANUSER },
{ "disabled", MODCMD_DISABLED },
+ { "helping", MODCMD_REQUIRE_HELPING },
{ "ignore_csuspend", MODCMD_IGNORE_CSUSPEND },
{ "joinable", MODCMD_REQUIRE_JOINABLE },
{ "keepbound", MODCMD_KEEP_BOUND },
{ "loghostmask", MODCMD_LOG_HOSTMASK },
- { "nolog", MODCMD_NO_LOG },
{ "networkhelper", MODCMD_REQUIRE_NETWORK_HELPER },
{ "never_csuspend", MODCMD_NEVER_CSUSPEND },
+ { "nolog", MODCMD_NO_LOG },
{ "oper", MODCMD_REQUIRE_OPER },
{ "qualified", MODCMD_REQUIRE_QUALIFIED },
{ "regchan", MODCMD_REQUIRE_REGCHAN },
{ "supporthelper", MODCMD_REQUIRE_SUPPORT_HELPER },
- { "helping", MODCMD_REQUIRE_HELPING },
{ "toy", MODCMD_TOY },
{ NULL, 0 }
};
rflags |= ACTION_STAFF;
}
if (cmd->min_opserv_level > 0) {
- if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY))) return 0;
+ if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY)))
+ return 0;
rflags |= ACTION_STAFF;
}
if (cmd->req_account_flags || cmd->deny_account_flags) {
/* If it's an override, return a special value. */
if ((flags & MODCMD_REQUIRE_CHANUSER)
&& (options & SVCCMD_NOISY)
- && (uData->access > 500)
+ && (!uData || (uData->access > 500))
&& (!(uData = _GetChannelUser(channel->channel_info, user->handle_info, 0, 0))
|| uData->access < cmd->min_channel_access)
&& !(flags & (MODCMD_REQUIRE_STAFF|MODCMD_REQUIRE_HELPING))) {
svccmd_send_help(struct userNode *user, struct userNode *bot, struct svccmd *cmd) {
char cmdname[MAXLEN];
unsigned int nn;
+ int r;
/* Show command name (in bold). */
for (nn=0; cmd->name[nn]; nn++)
cmdname[nn] = toupper(cmd->name[nn]);
cmdname[nn] = 0;
- send_message_type(4, user, bot, "$b%s$b", cmdname);
+ send_message_type(4, user, bot, "=--- $b%s$b ---=", cmdname);
+
+ /* Show the help entry for the underlying command. */
+ /* Lets not show help for a parent command, thats not what
+ * they asked for!
+ * return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name);
+ * TODO: We actually DO want to show the parent IF there is no other help.
+ */
+ r = send_help(user, bot, cmd->command->parent->helpfile, cmd->name);
+
/* If it's an alias, show what it's an alias for. */
if (cmd->alias.used) {
char alias_text[MAXLEN];
unsplit_string((char**)cmd->alias.list, cmd->alias.used, alias_text);
- send_message(user, bot, "MCMSG_COMMAND_ALIASES", cmd->name, alias_text);
+ send_message(user, bot, "MCMSG_HELP_COMMAND_ALIAS", alias_text);
}
- /* Show the help entry for the underlying command. */
- return send_help(user, bot, cmd->command->parent->helpfile, cmd->command->name);
+ return r;
}
int
struct svccmd *cmd;
unsigned int ii;
+ /* If there is a command, send help for the command */
if ((cmd = dict_find(service->commands, topic, NULL)))
return svccmd_send_help(user, service->bot, cmd);
+
+ /* If there is no topic show the index */
if (!topic)
topic = "<index>";
+ /* look for the thing in the included help files */
for (ii = 0; ii < service->modules.used; ++ii) {
module = service->modules.list[ii];
if (!module->helpfile)
if (dict_find(module->helpfile->db, topic, NULL))
return send_help(user, service->bot, module->helpfile, topic);
}
+ /* Otherwise say we cant find it */
send_message(user, service->bot, "MSG_TOPIC_UNKNOWN");
return 0;
}
irc_notice_user(bot, user, "\001CLIENTINFO CLIENTINFO PING TIME USERINFO VERSION\x01");
} else if (!irccasecmp(text, "PING")) {
if (term) {
- snprintf(response, sizeof(response), "\x01PONG %s\x01", term);
+ snprintf(response, sizeof(response), "\x01PING %s\x01", term);
irc_notice_user(bot, user, response);
} else {
- irc_notice_user(bot,user, "\x01PONG\x01");
+ irc_notice_user(bot,user, "\x01PING\x01");
}
} else if (!irccasecmp(text, "TIME")) {
struct tm tm;
irc_notice_user(bot, user, response);
} else if (!irccasecmp(text, "VERSION")) {
/* This function provides copyright management information
- * to end users of srvx. You should not alter, disable or
+ * to end users of X3. You should not alter, disable or
* remove this command or its accessibility to normal IRC
* users, except to add copyright information pertaining
- * to changes you make to srvx.
+ * to changes you make to X3.
*/
- snprintf(response, sizeof(response), "\x01VERSION %s (%s) %s\x01", PACKAGE_STRING, CODENAME, "");
+ snprintf(response, sizeof(response), "\x01VERSION %s\x01", PACKAGE_STRING);
irc_notice_user(bot, user, response);
}
return;
}
static MODCMD_FUNC(cmd_joiner) {
- char cmdname[80];
+ char cmdname[MAXLEN];
if (argc < 2) {
int len = sprintf(cmdname, "%s ", cmd->name);
if (flags & MODCMD_REQUIRE_HELPING)
access = "helping";
else if (flags & MODCMD_REQUIRE_STAFF) {
- switch (flags & MODCMD_REQUIRE_STAFF) {
- case MODCMD_REQUIRE_OPER: access = "oper"; break;
- case MODCMD_REQUIRE_OPER | MODCMD_REQUIRE_NETWORK_HELPER:
- case MODCMD_REQUIRE_NETWORK_HELPER: access = "net.helper"; break;
- default: access = "staff"; break;
- }
+ if (flags & MODCMD_REQUIRE_OPER)
+ access = "oper";
+ else if (flags & MODCMD_REQUIRE_NETWORK_HELPER)
+ access = "net.helper";
+ else
+ access = "staff";
} else
access = strtab(svccmd->min_channel_access);
tbl.contents[ii+1][1+show_opserv_level] = access;
reply("MCMSG_ALREADY_SERVICE", bot->nick);
return 0;
}
- bot = AddService(nick, desc, hostname);
+ bot = AddService(nick, NULL, desc, hostname);
service_register(bot);
reply("MCMSG_NEW_SERVICE", bot->nick);
return 1;
static MODCMD_FUNC(cmd_version) {
/* This function provides copyright management information to end
- * users of srvx. You should not alter, disable or remove this
+ * users of X3. You should not alter, disable or remove this
* command or its accessibility to normal IRC users, except to add
- * copyright information pertaining to changes you make to srvx.
+ * copyright information pertaining to changes you make to X3.
*/
- send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"$b ("CODENAME"), Built: "__DATE__", "__TIME__".\nCopyright 2000-2004 srvx Development Team.\nThe srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net.");
- if ((argc > 1) && !irccasecmp(argv[1], "arch"))
- send_message_type(4, user, cmd->parent->bot, "%s", "");
+ 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.");
+ 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.");
return 1;
}
hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING);
if (desc) {
if (!svc)
- svc = service_register(AddService(nick, desc, hostname));
+ svc = service_register(AddService(nick, NULL, desc, hostname));
else if (hostname)
strcpy(svc->bot->hostname, hostname);
desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING);
if (!irccasecmp(def_binds[ii].svcname, "ChanServ")) {
service_make_alias(service, "addowner", "*chanserv.adduser", "$1", "owner", NULL);
service_make_alias(service, "addcoowner", "*chanserv.adduser", "$1", "coowner", NULL);
- service_make_alias(service, "addmaster", "*chanserv.adduser", "$1", "master", NULL);
+ service_make_alias(service, "addmanager", "*chanserv.adduser", "$1", "manager", NULL);
service_make_alias(service, "addop", "*chanserv.adduser", "$1", "op", NULL);
+ service_make_alias(service, "addhop", "*chanserv.adduser", "$1", "halfop", NULL);
service_make_alias(service, "addpeon", "*chanserv.adduser", "$1", "peon", NULL);
service_make_alias(service, "delowner", "*chanserv.deluser", "owner", "$1", NULL);
service_make_alias(service, "delcoowner", "*chanserv.deluser", "coowner", "$1", NULL);
- service_make_alias(service, "delmaster", "*chanserv.deluser", "master", "$1", NULL);
+ service_make_alias(service, "delmanager", "*chanserv.deluser", "manager", "$1", NULL);
service_make_alias(service, "delop", "*chanserv.deluser", "op", "$1", NULL);
service_make_alias(service, "delpeon", "*chanserv.deluser", "peon", "$1", NULL);
service_make_alias(service, "command", "*modcmd.command", NULL);
projects / irc / evilnet / x3.git / blobdiff