Add support for blocking tag messages with the deaf mode.

[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 a13d4d613fb36e2f4ba728959365a0789550e1ac..2f47912aee76d0064972f9dae73599a925c60bfa 100644 (file)
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -1,10 +1,16 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2013, 2017-2019 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>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 John Brooks <special@inspircd.org>
  *   Copyright (C) 2008-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -54,15 +60,17 @@ class callerid_data
 
        callerid_data() : lastnotify(0) { }
 
-       std::string ToString(SerializeFormat format) const
+       std::string ToString(bool human) const
        {
                std::ostringstream oss;
                oss << lastnotify;
                for (UserSet::const_iterator i = accepting.begin(); i != accepting.end(); ++i)
                {
                        User* u = *i;
-                       // Encode UIDs.
-                       oss << "," << (format == FORMAT_USER ? u->nick : u->uuid);
+                       if (human)
+                               oss << ' ' << u->nick;
+                       else
+                               oss << ',' << u->uuid;
                }
                return oss.str();
        }
@@ -75,22 +83,20 @@ struct CallerIDExtInfo : public ExtensionItem
        {
        }
 
-       std::string serialize(SerializeFormat format, const Extensible* container, void* item) const CXX11_OVERRIDE
+       std::string ToHuman(const Extensible* container, void* item) const CXX11_OVERRIDE
        {
-               std::string ret;
-               if (format != FORMAT_NETWORK)
-               {
-                       callerid_data* dat = static_cast<callerid_data*>(item);
-                       ret = dat->ToString(format);
-               }
-               return ret;
+               callerid_data* dat = static_cast<callerid_data*>(item);
+               return dat->ToString(true);
        }
 
-       void unserialize(SerializeFormat format, Extensible* container, const std::string& value) CXX11_OVERRIDE
+       std::string ToInternal(const Extensible* container, void* item) const CXX11_OVERRIDE
        {
-               if (format == FORMAT_NETWORK)
-                       return;
+               callerid_data* dat = static_cast<callerid_data*>(item);
+               return dat->ToString(false);
+       }
 
+       void FromInternal(Extensible* container, const std::string& value) CXX11_OVERRIDE
+       {
                void* old = get_raw(container);
                if (old)
                        this->free(NULL, old);
@@ -198,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
@@ -239,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;
 
@@ -392,7 +398,7 @@ public:
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Implementation of callerid, provides user mode +g and the ACCEPT command", VF_COMMON | VF_VENDOR);
+               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);
        }
 
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE