Sync helpop chmodes s and p with docs

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

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index a8728ef722da64a3935348a04ce0ae31174d5fd3..361e2bdda21e8f4353fc5813a2edb665b7ca42f8 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013, 2017-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013, 2017-2019, 2021 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2013 Adam <Adam@anope.org>
  *   Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
@@ -45,7 +45,7 @@ enum
 class callerid_data
 {
  public:
-       typedef insp::flat_set<User*> UserSet;
+       typedef insp::flat_set<User*> UserSet;
        typedef std::vector<callerid_data*> CallerIdDataSet;
 
        time_t lastnotify;
@@ -67,8 +67,10 @@ class callerid_data
                for (UserSet::const_iterator i = accepting.begin(); i != accepting.end(); ++i)
                {
                        User* u = *i;
-                       // Encode UIDs.
-                       oss << "," << (human ? u->nick : u->uuid);
+                       if (human)
+                               oss << ' ' << u->nick;
+                       else
+                               oss << ',' << u->uuid;
                }
                return oss.str();
        }
@@ -202,7 +204,7 @@ public:
                parameter = (action.second ? "" : "-") + action.first->uuid;
        }
 
-       /** Will take any number of nicks (up to MaxTargets), which can be seperated by commas.
+       /** Will take any number of nicks (up to MaxTargets), which can be separated by commas.
         * - in front of any nick removes, and an * lists. This effectively means you can do:
         * /accept nick1,nick2,nick3,*
         * to add 3 nicks and then show your list
@@ -243,12 +245,12 @@ public:
        RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
                // There is a list in parameters[0] in two cases:
-               // Either when the source is remote, this happens because 2.0 servers send comma seperated uuid lists,
+               // Either when the source is remote, this happens because 2.0 servers send comma separated uuid lists,
                // we don't split those but broadcast them, as before.
                //
                // Or if the source is local then LoopCall() runs OnPostCommand() after each entry in the list,
                // meaning the linking module has sent an ACCEPT already for each entry in the list to the
-               // appropiate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere.
+               // appropriate server and the ACCEPT with the list of nicks (this) doesn't need to be sent anywhere.
                if ((!IS_LOCAL(user)) && (parameters[0].find(',') != std::string::npos))
                        return ROUTE_BROADCAST;
 
@@ -396,7 +398,7 @@ public:
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides user mode g (bot) which allows users to require that other users are on their whitelist before messaging them.", VF_COMMON | VF_VENDOR);
+               return Version("Provides user mode g (callerid) which allows users to require that other users are on their whitelist before messaging them.", VF_COMMON | VF_VENDOR);
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE