Textual improvements and fixes such as typos, casing, etc. (#1612)

[user/henk/code/inspircd.git] / src / modules / m_clones.cpp

diff --git a/src/modules/m_clones.cpp b/src/modules/m_clones.cpp
index 1f505e9a21dbc4d3a0e7b1463e174ea879cce298..1a3a5fd7bb04498401bfb966149e0c53e7a3d99d 100644 (file)
--- a/src/modules/m_clones.cpp
+++ b/src/modules/m_clones.cpp
@@ -20,42 +20,64 @@
 
 
 #include "inspircd.h"
+#include "modules/ircv3_batch.h"
 
-/** Handle /CLONES
- */
-class CommandClones : public Command
+enum
+{
+       // InspIRCd-specific.
+       RPL_CLONES = 399
+};
+
+class CommandClones : public SplitCommand
 {
+ private:
+       IRCv3::Batch::API batchmanager;
+       IRCv3::Batch::Batch batch;
+
  public:
-       CommandClones(Module* Creator) : Command(Creator,"CLONES", 1)
+       CommandClones(Module* Creator)
+               : SplitCommand(Creator,"CLONES", 1)
+               , batchmanager(Creator)
+               , batch("inspircd.org/clones")
        {
-               flags_needed = 'o'; syntax = "<limit>";
+               flags_needed = 'o';
+               syntax = "<limit>";
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
        {
+               unsigned int limit = ConvToNum<unsigned int>(parameters[0]);
 
-               std::string clonesstr = "304 " + user->nick + " :CLONES";
+               // Syntax of a CLONES reply:
+               // :irc.example.com BATCH +<id> inspircd.org/clones :<min-count>
+               // @batch=<id> :irc.example.com 399 <client> <local-count> <remote-count> <cidr-mask>
+               /// :irc.example.com BATCH :-<id>
 
-               unsigned long limit = atoi(parameters[0].c_str());
+               if (batchmanager)
+               {
+                       batchmanager->Start(batch);
+                       batch.GetBatchStartMessage().PushParam(ConvToStr(limit));
+               }
 
-               /*
-                * Syntax of a /clones reply:
-                *  :server.name 304 target :CLONES START
-                *  :server.name 304 target :CLONES <count> <ip>
-                *  :server.name 304 target :CLONES END
-                */
+               const UserManager::CloneMap& clonemap = ServerInstance->Users->GetCloneMap();
+               for (UserManager::CloneMap::const_iterator i = clonemap.begin(); i != clonemap.end(); ++i)
+               {
+                       const UserManager::CloneCounts& counts = i->second;
+                       if (counts.global < limit)
+                               continue;
 
-               user->WriteServ(clonesstr + " START");
+                       Numeric::Numeric numeric(RPL_CLONES);
+                       numeric.push(counts.local);
+                       numeric.push(counts.global);
+                       numeric.push(i->first.str());
 
-               /* hostname or other */
-               // XXX I really don't like marking global_clones public for this. at all. -- w00t
-               for (clonemap::iterator x = ServerInstance->Users->global_clones.begin(); x != ServerInstance->Users->global_clones.end(); x++)
-               {
-                       if (x->second >= limit)
-                               user->WriteServ(clonesstr + " "+ ConvToStr(x->second) + " " + x->first.str());
+                       ClientProtocol::Messages::Numeric numericmsg(numeric, user);
+                       batch.AddToBatch(numericmsg);
+                       user->Send(ServerInstance->GetRFCEvents().numeric, numericmsg);
                }
 
-               user->WriteServ(clonesstr + " END");
+               if (batchmanager)
+                       batchmanager->End(batch);
 
                return CMD_SUCCESS;
        }
@@ -63,15 +85,18 @@ class CommandClones : public Command
 
 class ModuleClones : public Module
 {
+ public:
        CommandClones cmd;
+
  public:
-       ModuleClones() : cmd(this)
+       ModuleClones()
+               : cmd(this)
        {
        }
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the /CLONES command to retrieve information on clones.", VF_VENDOR);
+               return Version("Provides the CLONES command to retrieve information on clones", VF_VENDOR);
        }
 };