diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/botserv.c | 9 | ||||
| -rw-r--r-- | src/chanserv.c | 18 | ||||
| -rw-r--r-- | src/core/bs_fantasy_kick.c | 2 | ||||
| -rw-r--r-- | src/core/bs_fantasy_kickban.c | 3 | ||||
| -rw-r--r-- | src/core/bs_fantasy_owner.c | 4 | ||||
| -rw-r--r-- | src/core/bs_fantasy_seen.c | 2 | ||||
| -rw-r--r-- | src/core/bs_fantasy_unban.c | 2 |
7 files changed, 17 insertions, 23 deletions
diff --git a/src/botserv.c b/src/botserv.c index 735e608c4..39fc06d3e 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -407,13 +407,8 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) char *params = strtok(NULL, ""); char *event_name = EVENT_BOT_FANTASY_NO_ACCESS; - /* Warning: Hack Ahead - * To allow older modules to still work safely with the fantasy - * events, we replace the first char with '!' so that the cmd will - * be !trigger, and not *trigger or whatever, which will confuse - * them. Should be replaced after 1.8 -GD - */ - cmd[0] = '!'; + /* Strip off the fantasy character */ + cmd++; if (check_access(u, ci, CA_FANTASIA)) event_name = EVENT_BOT_FANTASY; diff --git a/src/chanserv.c b/src/chanserv.c index a2e2f6b0a..6c8147bb6 100644 --- a/src/chanserv.c +++ b/src/chanserv.c @@ -105,15 +105,15 @@ LevelInfo levelinfo[] = { int levelinfo_maxwidth = 0; CSModeUtil csmodeutils[] = { - { "DEOP", "!deop", "-o", CI_OPNOTICE, CA_OPDEOP, CA_OPDEOPME }, - { "OP", "!op", "+o", CI_OPNOTICE, CA_OPDEOP, CA_OPDEOPME }, - { "DEVOICE", "!devoice", "-v", 0 , CA_VOICE, CA_VOICEME }, - { "VOICE", "!voice", "+v", 0 , CA_VOICE, CA_VOICEME }, - { "DEHALFOP", "!dehalfop", "-h", 0 , CA_HALFOP, CA_HALFOPME }, - { "HALFOP", "!halfop", "+h", 0 , CA_HALFOP, CA_HALFOPME }, - { "DEPROTECT", "", "", 0 , CA_PROTECT, CA_PROTECTME }, - { "PROTECT", "", "", 0 , CA_PROTECT, CA_PROTECTME }, - { NULL } + { "DEOP", "deop", "-o", CI_OPNOTICE, CA_OPDEOP, CA_OPDEOPME }, + { "OP", "op", "+o", CI_OPNOTICE, CA_OPDEOP, CA_OPDEOPME }, + { "DEVOICE", "devoice", "-v", 0, CA_VOICE, CA_VOICEME }, + { "VOICE", "voice", "+v", 0, CA_VOICE, CA_VOICEME }, + { "DEHALFOP", "dehalfop", "-h", 0, CA_HALFOP, CA_HALFOPME }, + { "HALFOP", "halfop", "+h", 0, CA_HALFOP, CA_HALFOPME }, + { "DEPROTECT", "", "", 0, CA_PROTECT, CA_PROTECTME }, + { "PROTECT", "", "", 0, CA_PROTECT, CA_PROTECTME }, + { NULL } }; /* *INDENT-ON* */ diff --git a/src/core/bs_fantasy_kick.c b/src/core/bs_fantasy_kick.c index 9bd2ac818..223ce909f 100644 --- a/src/core/bs_fantasy_kick.c +++ b/src/core/bs_fantasy_kick.c @@ -62,7 +62,7 @@ int do_fantasy(int argc, char **argv) if (argc < 3) return MOD_CONT; - if ((stricmp(argv[0], "!kick") == 0) || (stricmp(argv[0], "!k") == 0)) { + if ((stricmp(argv[0], "kick") == 0) || (stricmp(argv[0], "k") == 0)) { u = finduser(argv[1]); ci = cs_findchan(argv[2]); if (!u || !ci) diff --git a/src/core/bs_fantasy_kickban.c b/src/core/bs_fantasy_kickban.c index 8385f7175..5d978da56 100644 --- a/src/core/bs_fantasy_kickban.c +++ b/src/core/bs_fantasy_kickban.c @@ -62,8 +62,7 @@ int do_fantasy(int argc, char **argv) if (argc < 3) return MOD_CONT; - if ((stricmp(argv[0], "!kickban") == 0) - || (stricmp(argv[0], "!kb") == 0)) { + if ((stricmp(argv[0], "kickban") == 0) || (stricmp(argv[0], "kb") == 0)) { u = finduser(argv[1]); ci = cs_findchan(argv[2]); if (!u || !ci) diff --git a/src/core/bs_fantasy_owner.c b/src/core/bs_fantasy_owner.c index 7609fa8fc..bf4305dbf 100644 --- a/src/core/bs_fantasy_owner.c +++ b/src/core/bs_fantasy_owner.c @@ -66,7 +66,7 @@ int do_fantasy(int argc, char **argv) if (argc < 3) return MOD_CONT; - if (stricmp(argv[0], "!deowner") == 0) { + if (stricmp(argv[0], "deowner") == 0) { u = finduser(argv[1]); ci = cs_findchan(argv[2]); if (!u || !ci) @@ -74,7 +74,7 @@ int do_fantasy(int argc, char **argv) if (is_founder(u, ci)) bot_raw_mode(u, ci, ircd->ownerunset, u->nick); - } else if (stricmp(argv[0], "!owner") == 0) { + } else if (stricmp(argv[0], "owner") == 0) { u = finduser(argv[1]); ci = cs_findchan(argv[2]); if (!u || !ci) diff --git a/src/core/bs_fantasy_seen.c b/src/core/bs_fantasy_seen.c index 2a49cbcbb..c6cb63d8c 100644 --- a/src/core/bs_fantasy_seen.c +++ b/src/core/bs_fantasy_seen.c @@ -65,7 +65,7 @@ int do_fantasy(int argc, char **argv) if (argc < 4) return MOD_CONT; - if (stricmp(argv[0], "!seen") == 0) { + if (stricmp(argv[0], "seen") == 0) { u = finduser(argv[1]); ci = cs_findchan(argv[2]); if (!u || !ci) diff --git a/src/core/bs_fantasy_unban.c b/src/core/bs_fantasy_unban.c index 5f0429081..9e4005b9c 100644 --- a/src/core/bs_fantasy_unban.c +++ b/src/core/bs_fantasy_unban.c @@ -61,7 +61,7 @@ int do_fantasy(int argc, char **argv) if (argc < 3) return MOD_CONT; - if (stricmp(argv[0], "!unban") == 0) { + if (stricmp(argv[0], "unban") == 0) { u = finduser(argv[1]); ci = cs_findchan(argv[2]); if (!u || !ci || !check_access(u, ci, CA_UNBAN)) |