Update my name and email address.

[user/henk/code/inspircd.git] / include / modules / ircv3.h

diff --git a/include/modules/ircv3.h b/include/modules/ircv3.h
index 338abdeba25b6e1552a1c33d693e59088349de0a..3e58eb102d10e25e5fdff3afcae1fe7cce6dba3e 100644 (file)
--- a/include/modules/ircv3.h
+++ b/include/modules/ircv3.h
@@ -40,11 +40,11 @@ class IRCv3::WriteNeighborsWithCap : public User::ForEachNeighborHandler
        }
 
  public:
-       WriteNeighborsWithCap(User* user, ClientProtocol::Event& ev, const Cap::Capability& capability)
+       WriteNeighborsWithCap(User* user, ClientProtocol::Event& ev, const Cap::Capability& capability, bool include_self = false)
                : cap(capability)
                , protoev(ev)
        {
-               user->ForEachNeighbor(*this, false);
+               user->ForEachNeighbor(*this, include_self);
        }
 };
 
@@ -67,6 +67,7 @@ class IRCv3::WriteNeighborsWithCap : public User::ForEachNeighborHandler
 template <typename T>
 class IRCv3::CapTag : public ClientProtocol::MessageTagProvider
 {
+ protected:
        Cap::Capability cap;
        const std::string tagname;
 
@@ -75,7 +76,7 @@ class IRCv3::CapTag : public ClientProtocol::MessageTagProvider
                return cap.get(user);
        }
 
-       void OnClientProtocolPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
+       void OnPopulateTags(ClientProtocol::Message& msg) CXX11_OVERRIDE
        {
                T& tag = static_cast<T&>(*this);
                const std::string* const val = tag.GetValue(msg);