Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters

[user/henk/code/inspircd.git] / src / coremods / core_channel / cmd_invite.cpp

diff --git a/src/coremods/core_channel/cmd_invite.cpp b/src/coremods/core_channel/cmd_invite.cpp
index 96f56058256658177e52ed8c9f0fb68d7e9ab18c..a1319ebc049651d2099faf6149b33c960622128b 100644 (file)
--- a/src/coremods/core_channel/cmd_invite.cpp
+++ b/src/coremods/core_channel/cmd_invite.cpp
@@ -58,7 +58,7 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 
                if ((!c) || (!u) || (u->registered != REG_ALL))
                {
-                       user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", c ? parameters[0].c_str() : parameters[1].c_str());
+                       user->WriteNumeric(Numerics::NoSuchNick(c ? parameters[0] : parameters[1]));
                        return CMD_FAILURE;
                }
 
@@ -77,13 +77,13 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 
                if ((IS_LOCAL(user)) && (!c->HasUser(user)))
                {
-                       user->WriteNumeric(ERR_NOTONCHANNEL, "%s :You're not on that channel!", c->name.c_str());
+                       user->WriteNumeric(ERR_NOTONCHANNEL, c->name, "You're not on that channel!");
                        return CMD_FAILURE;
                }
 
                if (c->HasUser(u))
                {
-                       user->WriteNumeric(ERR_USERONCHANNEL, "%s %s :is already on channel", u->nick.c_str(), c->name.c_str());
+                       user->WriteNumeric(ERR_USERONCHANNEL, u->nick, c->name, "is already on channel");
                        return CMD_FAILURE;
                }
 
@@ -102,8 +102,8 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
                                {
                                        // Check whether halfop mode is available and phrase error message accordingly
                                        ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
-                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You must be a channel %soperator",
-                                               c->name.c_str(), (mh && mh->name == "halfop" ? "half-" : ""));
+                                       user->WriteNumeric(ERR_CHANOPRIVSNEEDED, c->name, InspIRCd::Format("You must be a channel %soperator",
+                                               (mh && mh->name == "halfop" ? "half-" : "")));
                                        return CMD_FAILURE;
                                }
                        }
@@ -117,36 +117,41 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
 
                if (IS_LOCAL(user))
                {
-                       user->WriteNumeric(RPL_INVITING, "%s %s", u->nick.c_str(),c->name.c_str());
+                       user->WriteNumeric(RPL_INVITING, u->nick, c->name);
                        if (u->IsAway())
-                               user->WriteNumeric(RPL_AWAY, "%s :%s", u->nick.c_str(), u->awaymsg.c_str());
+                               user->WriteNumeric(RPL_AWAY, u->nick, u->awaymsg);
                }
 
-               if (ServerInstance->Config->AnnounceInvites != ServerConfig::INVITE_ANNOUNCE_NONE)
+               char prefix = 0;
+               unsigned int minrank = 0;
+               switch (ServerInstance->Config->AnnounceInvites)
                {
-                       char prefix;
-                       switch (ServerInstance->Config->AnnounceInvites)
+                       case ServerConfig::INVITE_ANNOUNCE_OPS:
                        {
-                               case ServerConfig::INVITE_ANNOUNCE_OPS:
-                               {
-                                       prefix = '@';
-                                       break;
-                               }
-                               case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
-                               {
-                                       PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
-                                       prefix = (mh && mh->name == "halfop" ? mh->GetPrefix() : '@');
-                                       break;
-                               }
-                               default:
+                               prefix = '@';
+                               minrank = OP_VALUE;
+                               break;
+                       }
+                       case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
+                       {
+                               PrefixMode* mh = ServerInstance->Modes->FindPrefixMode('h');
+                               if ((mh) && (mh->name == "halfop"))
                                {
-                                       prefix = 0;
-                                       break;
+                                       prefix = mh->GetPrefix();
+                                       minrank = mh->GetPrefixRank();
                                }
+                               break;
+                       }
+                       default:
+                       {
                        }
-                       c->WriteAllExceptSender(user, true, prefix, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
                }
-               FOREACH_MOD(OnUserInvite, (user,u,c,timeout));
+
+               CUList excepts;
+               FOREACH_MOD(OnUserInvite, (user, u, c, timeout, minrank, excepts));
+
+               if (ServerInstance->Config->AnnounceInvites != ServerConfig::INVITE_ANNOUNCE_NONE)
+                       c->WriteAllExcept(user, true, prefix, excepts, "NOTICE %s :*** %s invited %s into the channel", c->name.c_str(), user->nick.c_str(), u->nick.c_str());
        }
        else if (IS_LOCAL(user))
        {
@@ -156,9 +161,9 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
                if (list)
                {
                        for (Invite::List::const_iterator i = list->begin(); i != list->end(); ++i)
-                               user->WriteNumeric(RPL_INVITELIST, ":%s", (*i)->chan->name.c_str());
+                               user->WriteNumeric(RPL_INVITELIST, (*i)->chan->name);
                }
-               user->WriteNumeric(RPL_ENDOFINVITELIST, ":End of INVITE list");
+               user->WriteNumeric(RPL_ENDOFINVITELIST, "End of INVITE list");
        }
        return CMD_SUCCESS;
 }