diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/coremods/core_privmsg.cpp | 20 | ||||
| -rw-r--r-- | src/users.cpp | 13 |
2 files changed, 19 insertions, 14 deletions
diff --git a/src/coremods/core_privmsg.cpp b/src/coremods/core_privmsg.cpp index fbabc4a5c..34953bbe8 100644 --- a/src/coremods/core_privmsg.cpp +++ b/src/coremods/core_privmsg.cpp @@ -31,6 +31,13 @@ class MessageCommandBase : public Command ChanModeReference moderatedmode; ChanModeReference noextmsgmode; + /** Send a PRIVMSG or NOTICE message to all local users from the given user + * @param user User sending the message + * @param msg The message to send + * @param mt Type of the message (MSG_PRIVMSG or MSG_NOTICE) + */ + static void SendAll(User* user, const std::string& msg, MessageType mt); + public: MessageCommandBase(Module* parent, MessageType mt) : Command(parent, MessageTypeString[mt], 2, 2) @@ -57,6 +64,17 @@ class MessageCommandBase : public Command } }; +void MessageCommandBase::SendAll(User* user, const std::string& msg, MessageType mt) +{ + const std::string message = ":" + user->GetFullHost() + " " + MessageTypeString[mt] + " $* :" + msg; + const LocalUserList& list = ServerInstance->Users->local_users; + for (LocalUserList::const_iterator i = list.begin(); i != list.end(); ++i) + { + if ((*i)->registered == REG_ALL) + (*i)->Write(message); + } +} + CmdResult MessageCommandBase::HandleMessage(const std::vector<std::string>& parameters, User* user, MessageType mt) { User *dest; @@ -87,7 +105,7 @@ CmdResult MessageCommandBase::HandleMessage(const std::vector<std::string>& para FOREACH_MOD(OnText, (user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, except_list)); if (InspIRCd::Match(ServerInstance->Config->ServerName, servermask, NULL)) { - user->SendAll(MessageTypeString[mt], "%s", text); + SendAll(user, text, mt); } FOREACH_MOD(OnUserMessage, (user, (void*)parameters[0].c_str(), TYPE_SERVER, text, 0, except_list, mt)); return CMD_SUCCESS; diff --git a/src/users.cpp b/src/users.cpp index 40147b37d..28a8bd4ea 100644 --- a/src/users.cpp +++ b/src/users.cpp @@ -1129,19 +1129,6 @@ bool User::ChangeIdent(const std::string& newident) return true; } -void User::SendAll(const char* command, const char* text, ...) -{ - std::string textbuffer; - VAFORMAT(textbuffer, text, text); - const std::string message = ":" + this->GetFullHost() + " " + command + " $* :" + textbuffer; - - for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++) - { - if ((*i)->registered == REG_ALL) - (*i)->Write(message); - } -} - /* * Sets a user's connection class. * If the class name is provided, it will be used. Otherwise, the class will be guessed using host/ip/ident/etc. |