Remove the Kiwi links from the readme.

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

diff --git a/include/modules/ircv3.h b/include/modules/ircv3.h
index 338abdeba25b6e1552a1c33d693e59088349de0a..71bff21722ffaa148d5c8cc575f7c918ca0a9d29 100644 (file)
--- a/include/modules/ircv3.h
+++ b/include/modules/ircv3.h
@@ -1,7 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2015, 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * 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
@@ -40,11 +41,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 +68,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 +77,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);