diff options
Diffstat (limited to 'src')
113 files changed, 252 insertions, 258 deletions
diff --git a/src/command.cpp b/src/command.cpp index 89318776b..43c76ac52 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -29,7 +29,7 @@ Command::~Command() } } -CommandReturn Command::Execute(User *u, std::vector<ci::string> &) { return MOD_CONT; } +CommandReturn Command::Execute(User *u, const std::vector<ci::string> &) { return MOD_CONT; } bool Command::OnHelp(User *u, const ci::string &subcommand) { return false; } diff --git a/src/core/bs_act.c b/src/core/bs_act.c index 0fea7e929..c30c8f62d 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -22,9 +22,10 @@ class CommandBSAct : public Command { } - CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) + CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { ChannelInfo *ci = cs_findchan(params[0].c_str()); + ci::string message = params[1]; if (!check_access(u, ci, CA_SAY)) { @@ -45,13 +46,13 @@ class CommandBSAct : public Command } size_t i = 0; - while ((i = params[1].find_first_of("\001"), i) && i != std::string::npos) - params[1].erase(i, 1); + while ((i = message.find_first_of("\001"), i) && i != std::string::npos) + message.erase(i, 1); - ircdproto->SendAction(ci->bi, ci->name, "%s", params[1].c_str()); + ircdproto->SendAction(ci->bi, ci->name, "%s", message.c_str()); ci->bi->lastmsg = time(NULL); if (LogBot && LogChannel && LogChan && !debug && findchan(LogChannel)) - ircdproto->SendPrivmsg(ci->bi, LogChannel, "ACT %s %s %s", u->nick, ci->name, params[1].c_str()); + ircdproto->SendPrivmsg(ci->bi, LogChannel, "ACT %s %s %s", u->nick, ci->name, message.c_str()); return MOD_CONT; } diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index 82542580e..10d224b8e 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -22,7 +22,7 @@ class CommandBSAssign : public Command { } - CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) + CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { const char *chan = params[0].c_str(); const char *nick = params[1].c_str(); diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index fc9c10bcd..3041ced7b 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -234,7 +234,7 @@ class CommandBSBadwords : public Command { } - CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) + CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { const char *chan = params[0].c_str(); ci::string cmd = params[1]; diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 955f4e42c..cba750cbe 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -18,7 +18,7 @@ class CommandBSBot : public Command { private: - CommandReturn DoAdd(User *u, std::vector<ci::string> ¶ms) + CommandReturn DoAdd(User *u, const std::vector<ci::string> ¶ms) { const char *nick = params[1].c_str(); const char *user = params[2].c_str(); @@ -117,7 +117,7 @@ class CommandBSBot : public Command return MOD_CONT; } - CommandReturn DoChange(User *u, std::vector<ci::string> ¶ms) + CommandReturn DoChange(User *u, const std::vector<ci::string> ¶ms) { const char *oldnick = params[1].c_str(); const char *nick = params.size() > 2 ? params[2].c_str() : NULL; @@ -297,7 +297,7 @@ class CommandBSBot : public Command return MOD_CONT; } - CommandReturn DoDel(User *u, std::vector<ci::string> ¶ms) + CommandReturn DoDel(User *u, const std::vector<ci::string> ¶ms) { const char *nick = params[1].c_str(); BotInfo *bi; @@ -335,7 +335,7 @@ class CommandBSBot : public Command this->SetFlag(CFLAG_STRIP_CHANNEL); } - CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) + CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { ci::string cmd = params[0]; @@ -360,11 +360,12 @@ class CommandBSBot : public Command return MOD_CONT; } + std::vector<ci::string> tempparams = params; // ADD takes less params than CHANGE, so we need to take 6 if given and append it with a space to 5. - if (params.size() >= 6) - params[4] = params[4] + " " + params[5]; + if (tempparams.size() >= 6) + tempparams[4] = tempparams[4] + " " + tempparams[5]; - return this->DoAdd(u, params); + return this->DoAdd(u, tempparams); } else if (cmd == "CHANGE") { diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c index 9c3e27060..85ed84e17 100644 --- a/src/core/bs_botlist.c +++ b/src/core/bs_botlist.c @@ -22,7 +22,7 @@ class CommandBSBotList : public Command { } - CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) + CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { int i, count = 0; BotInfo *bi; diff --git a/src/core/bs_help.c b/src/core/bs_help.c index 05fbc9f8d..dcf01009c 100644 --- a/src/core/bs_help.c +++ b/src/core/bs_help.c @@ -24,7 +24,7 @@ class CommandBSHelp : public Command this->SetFlag(CFLAG_STRIP_CHANNEL); } - CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) + CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { mod_help_cmd(s_BotServ, u, BOTSERV, params[0].c_str()); return MOD_CONT; diff --git a/src/core/bs_info.c b/src/core/bs_info.c index 86daebbd2..82755fe32 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -52,7 +52,7 @@ class CommandBSInfo : public Command this->SetFlag(CFLAG_STRIP_CHANNEL); } - CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) + CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { BotInfo *bi; ChannelInfo *ci; diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c index 7f9ee8b7b..97e36005a 100644 --- a/src/core/bs_kick.c +++ b/src/core/bs_kick.c @@ -24,7 +24,7 @@ class CommandBSKick : public Command { } - CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) + CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { const char *chan = params[0].c_str(); ci::string option = params[1]; diff --git a/src/core/bs_say.c b/src/core/bs_say.c index 2a1752c05..b96ae194d 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -22,7 +22,7 @@ class CommandBSSay : public Command { } - CommandReturn Execute(User *u, std::vector<ci::string> ¶ms) |