Remove the Kiwi links from the readme.

[user/henk/code/inspircd.git] / include / clientprotocol.h

diff --git a/include/clientprotocol.h b/include/clientprotocol.h
index 260e463eb10f84e89a5f7c9952dadb14966c8c16..29035250d34e04bc9fceb32f031747bd2f333368 100644 (file)
--- a/include/clientprotocol.h
+++ b/include/clientprotocol.h
@@ -1,7 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 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
@@ -238,13 +239,15 @@ class ClientProtocol::Message : public ClientProtocol::MessageSource
                }
 
                Param(int, const char* s)
-                       : owned(true)
+                       : ptr(NULL)
+                       , owned(true)
                {
                        new(str) std::string(s);
                }
 
                Param(int, const std::string& s)
-                       : owned(true)
+                       : ptr(NULL)
+                       , owned(true)
                {
                         new(str) std::string(s);
                }
@@ -360,7 +363,7 @@ class ClientProtocol::Message : public ClientProtocol::MessageSource
 
        /** Add a parameter to the parameter list.
         * @param str String to add.
-        * The string will NOT be copied, it must remain alive until ClearParams() is called or until the object is destroyed.
+        * The string will NOT be copied, it must remain alive until ClearParams() is called or until the object is destroyed.
         */
        void PushParamRef(const std::string& str) { params.push_back(str); }
 
@@ -479,7 +482,7 @@ class ClientProtocol::Event
 
        /** Constructor.
         * @param protoeventprov Protocol event provider the event is an instance of.
-        * @param msg Message to include in this event by default.
+        * @param msg Message to include in this event by default.
         */
        Event(EventProvider& protoeventprov, ClientProtocol::Message& msg)
                : event(&protoeventprov)
@@ -515,6 +518,16 @@ class ClientProtocol::Event
        void GetMessagesForUser(LocalUser* user, MessageList& messagelist);
 };
 
+class ClientProtocol::MessageTagEvent
+       : public Events::ModuleEventProvider
+{
+ public:
+       MessageTagEvent(Module* mod)
+               : ModuleEventProvider(mod, "event/messagetag")
+       {
+       }
+};
+
 /** Base class for message tag providers.
  * All message tags belong to a message tag provider. Message tag providers can populate messages
  * with tags before the message is sent and they have the job of determining whether a user should
@@ -537,7 +550,7 @@ class ClientProtocol::MessageTagProvider : public Events::ModuleEventListener
         * The default implementation does nothing.
         * @param msg Message to be populated with tags.
         */
-       virtual void OnClientProtocolPopulateTags(ClientProtocol::Message& msg)
+       virtual void OnPopulateTags(ClientProtocol::Message& msg)
        {
        }
 
@@ -549,7 +562,7 @@ class ClientProtocol::MessageTagProvider : public Events::ModuleEventListener
         * MOD_RES_PASSTHRU to make no decision. If no hooks accept a tag, the tag is rejected.
         * The default implementation returns MOD_RES_PASSTHRU.
         */
-       virtual ModResult OnClientProtocolProcessTag(LocalUser* user, const std::string& tagname, std::string& tagvalue)
+       virtual ModResult OnProcessTag(User* user, const std::string& tagname, std::string& tagvalue)
        {
                return MOD_RES_PASSTHRU;
        }
@@ -667,7 +680,8 @@ struct ClientProtocol::RFCEvents
  */
 class CoreExport ClientProtocol::Serializer : public DataProvider
 {
-       Events::ModuleEventProvider evprov;
+ private:
+       ClientProtocol::MessageTagEvent evprov;
 
        /** Make a white list containing which tags a user should get.
         * @param user User in question.
@@ -688,7 +702,7 @@ class CoreExport ClientProtocol::Serializer : public DataProvider
         * @param tagname Name of the tag.
         * @param tagvalue Tag value, may be empty.
         * @param tags TagMap to place the tag into, if it gets accepted.
-        * @return True if no error occured, false if the tag name is invalid or if this tag already exists.
+        * @return True if no error occurred, false if the tag name is invalid or if this tag already exists.
         */
        bool HandleTag(LocalUser* user, const std::string& tagname, std::string& tagvalue, TagMap& tags) const;