Implement support for IRCv3 client-to-client tags.

[user/henk/code/inspircd.git] / src / modules / m_delayjoin.cpp

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index d157b97bcc90461ebf39d3895aa031919a1d6b7c..469f334393c36142d4976c01453322eba26b0f9f 100644 (file)
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -21,16 +21,23 @@
 
 
 #include "inspircd.h"
+#include "modules/ctctags.h"
 
 class DelayJoinMode : public ModeHandler
 {
+ private:
+       LocalIntExt& unjoined;
+
  public:
-       DelayJoinMode(Module* Parent) : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL)
+       DelayJoinMode(Module* Parent, LocalIntExt& ext)
+               : ModeHandler(Parent, "delayjoin", 'D', PARAM_NONE, MODETYPE_CHANNEL)
+               , unjoined(ext)
        {
                ranktoset = ranktounset = OP_VALUE;
        }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE;
+       void RevealUser(User* user, Channel* chan);
 };
 
 
@@ -56,8 +63,9 @@ class JoinHook : public ClientProtocol::EventHook
        ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE
        {
                const ClientProtocol::Events::Join& join = static_cast<const ClientProtocol::Events::Join&>(ev);
-               const User* const u = join.GetMember()->user;
-               if ((unjoined.get(u)) && (u != user))
+               const Membership* const memb = join.GetMember();
+               const User* const u = memb->user;
+               if ((unjoined.get(memb)) && (u != user))
                        return MOD_RES_DENY;
                return MOD_RES_PASSTHRU;
        }
@@ -65,18 +73,20 @@ class JoinHook : public ClientProtocol::EventHook
 
 }
 
-class ModuleDelayJoin : public Module
+class ModuleDelayJoin 
+       : public Module
+       , public CTCTags::EventListener
 {
-       DelayJoinMode djm;
-       void RevealUser(User* user, Channel* chan);
  public:
        LocalIntExt unjoined;
        JoinHook joinhook;
+       DelayJoinMode djm;
 
        ModuleDelayJoin()
-               : djm(this)
+               : CTCTags::EventListener(this)
                , unjoined("delayjoin", ExtensionItem::EXT_MEMBERSHIP, this)
                , joinhook(this, unjoined)
+               , djm(this, unjoined)
        {
        }
 
@@ -88,19 +98,10 @@ class ModuleDelayJoin : public Module
        void OnUserKick(User* source, Membership*, const std::string &reason, CUList&) CXX11_OVERRIDE;
        void OnBuildNeighborList(User* source, IncludeChanList& include, std::map<User*, bool>& exception) CXX11_OVERRIDE;
        void OnUserMessage(User* user, const MessageTarget& target, const MessageDetails& details) CXX11_OVERRIDE;
+       void OnUserTagMessage(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details) CXX11_OVERRIDE;
        ModResult OnRawMode(User* user, Channel* channel, ModeHandler* mh, const std::string& param, bool adding) CXX11_OVERRIDE;
 };
 
-// TODO: make RevealUser accessible from DelayJoinMode and get rid of this.
-class DummyMessageDetails : public MessageDetails
-{
-public:
-       DummyMessageDetails() : MessageDetails(MSG_PRIVMSG, "", ClientProtocol::TagMap()) { }
-       bool IsCTCP(std::string& name, std::string& body) const CXX11_OVERRIDE { return false; }
-       bool IsCTCP(std::string&) const CXX11_OVERRIDE { return false; }
-       bool IsCTCP() const CXX11_OVERRIDE { return false; }
-};
-
 ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 {
        /* no change */
@@ -113,13 +114,9 @@ ModeAction DelayJoinMode::OnModeChange(User* source, User* dest, Channel* channe
                 * Make all users visible, as +D is being removed. If we don't do this,
                 * they remain permanently invisible on this channel!
                 */
-               MessageTarget msgtarget(channel, 0);
-               DummyMessageDetails msgdetails;
                const Channel::MemberMap& users = channel->GetUsers();
                for (Channel::MemberMap::const_iterator n = users.begin(); n != users.end(); ++n)
-               {
-                       creator->OnUserMessage(n->first, msgtarget, msgdetails);
-               }
+                       RevealUser(n->first, channel);
        }
        channel->SetMode(this, adding);
        return MODEACTION_ALLOW;
@@ -184,16 +181,25 @@ void ModuleDelayJoin::OnBuildNeighborList(User* source, IncludeChanList& include
        }
 }
 
+void ModuleDelayJoin::OnUserTagMessage(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details)
+{
+       if (target.type != MessageTarget::TYPE_CHANNEL)
+               return;
+
+       Channel* channel = target.Get<Channel>();
+       djm.RevealUser(user, channel);
+}
+
 void ModuleDelayJoin::OnUserMessage(User* user, const MessageTarget& target, const MessageDetails& details)
 {
        if (target.type != MessageTarget::TYPE_CHANNEL)
                return;
 
        Channel* channel = target.Get<Channel>();
-       RevealUser(user, channel);
+       djm.RevealUser(user, channel);
 }
 
-void ModuleDelayJoin::RevealUser(User* user, Channel* chan)
+void DelayJoinMode::RevealUser(User* user, Channel* chan)
 {
        Membership* memb = chan->GetUser(user);
        if (!memb || !unjoined.set(memb, 0))
@@ -225,7 +231,7 @@ ModResult ModuleDelayJoin::OnRawMode(User* user, Channel* channel, ModeHandler*
        if (!dest)
                return MOD_RES_PASSTHRU;
 
-       RevealUser(dest, channel);
+       djm.RevealUser(dest, channel);
        return MOD_RES_PASSTHRU;
 }