Add support for blocking tag messages with the deaf mode.

[user/henk/code/inspircd.git] / src / clientprotocol.cpp

diff --git a/src/clientprotocol.cpp b/src/clientprotocol.cpp
index a732855a5619b5b71c224f541519ba1eb5c2eca6..666aa9af6706cd2ebc96807d9569f1a71ba41e2a 100644 (file)
--- a/src/clientprotocol.cpp
+++ b/src/clientprotocol.cpp
@@ -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
@@ -21,7 +22,7 @@
 
 ClientProtocol::Serializer::Serializer(Module* mod, const char* Name)
        : DataProvider(mod, std::string("serializer/") + Name)
-       , evprov(mod, "event/messagetag")
+       , evprov(mod)
 {
 }
 
@@ -35,7 +36,7 @@ bool ClientProtocol::Serializer::HandleTag(LocalUser* user, const std::string& t
        for (::Events::ModuleEventProvider::SubscriberList::const_iterator i = list.begin(); i != list.end(); ++i)
        {
                MessageTagProvider* const tagprov = static_cast<MessageTagProvider*>(*i);
-               const ModResult res = tagprov->OnClientProtocolProcessTag(user, tagname, tagvalue);
+               const ModResult res = tagprov->OnProcessTag(user, tagname, tagvalue);
                if (res == MOD_RES_ALLOW)
                        return tags.insert(std::make_pair(tagname, MessageTagData(tagprov, tagvalue))).second;
                else if (res == MOD_RES_DENY)
@@ -63,7 +64,7 @@ const ClientProtocol::SerializedMessage& ClientProtocol::Serializer::SerializeFo
        if (!msg.msginit_done)
        {
                msg.msginit_done = true;
-               FOREACH_MOD_CUSTOM(evprov, MessageTagProvider, OnClientProtocolPopulateTags, (msg));
+               FOREACH_MOD_CUSTOM(evprov, MessageTagProvider, OnPopulateTags, (msg));
        }
        return msg.GetSerialized(Message::SerializedInfo(this, MakeTagWhitelist(user, msg.GetTags())));
 }