Fix an shadowing warning in the spanningtree module.

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

diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp
index 55fe992b67d1b3b3a5ef66f0de9800af0717dde6..3e992f39f90f043355c76437e2e778d74df10dd8 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -25,7 +25,6 @@
 #include "socket.h"
 #include "xline.h"
 #include "iohook.h"
-#include "modules/server.h"
 
 #include "resolvers.h"
 #include "main.h"
@@ -39,12 +38,16 @@
 ModuleSpanningTree::ModuleSpanningTree()
        : Away::EventListener(this)
        , Stats::EventListener(this)
+       , CTCTags::EventListener(this)
        , rconnect(this)
        , rsquit(this)
        , map(this)
        , commands(this)
        , currmembid(0)
-       , eventprov(this, "event/server")
+       , broadcasteventprov(this, "event/server-broadcast")
+       , linkeventprov(this, "event/server-link")
+       , messageeventprov(this, "event/server-message")
+       , synceventprov(this, "event/server-sync")
        , sslapi(this)
        , DNS(this, "DNS")
        , tagevprov(this, "event/messagetag")
@@ -356,10 +359,10 @@ void ModuleSpanningTree::OnUserInvite(User* source, User* dest, Channel* channel
        if (IS_LOCAL(source))
        {
                CmdBuilder params(source, "INVITE");
-               params.push_back(dest->uuid);
-               params.push_back(channel->name);
+               params.push(dest->uuid);
+               params.push(channel->name);
                params.push_int(channel->age);
-               params.push_back(ConvToStr(expiry));
+               params.push(ConvToStr(expiry));
                params.Broadcast();
        }
 }
@@ -391,30 +394,72 @@ void ModuleSpanningTree::OnUserPostMessage(User* user, const MessageTarget& targ
                return;
 
        const char* message_type = (details.type == MSG_PRIVMSG ? "PRIVMSG" : "NOTICE");
-       if (target.type == MessageTarget::TYPE_USER)
+       switch (target.type)
        {
-               User* d = target.Get<User>();
-               if (!IS_LOCAL(d))
+               case MessageTarget::TYPE_USER:
                {
-                       CmdBuilder params(user, message_type);
-                       params.push_tags(details.tags_out);
-                       params.push_back(d->uuid);
-                       params.push_last(details.text);
-                       params.Unicast(d);
+                       User* d = target.Get<User>();
+                       if (!IS_LOCAL(d))
+                       {
+                               CmdBuilder params(user, message_type);
+                               params.push_tags(details.tags_out);
+                               params.push(d->uuid);
+                               params.push_last(details.text);
+                               params.Unicast(d);
+                       }
+                       break;
+               }
+               case MessageTarget::TYPE_CHANNEL:
+               {
+                       Utils->SendChannelMessage(user, target.Get<Channel>(), details.text, target.status, details.tags_out, details.exemptions, message_type);
+                       break;
+               }
+               case MessageTarget::TYPE_SERVER:
+               {
+                       const std::string* serverglob = target.Get<std::string>();
+                       CmdBuilder par(user, message_type);
+                       par.push_tags(details.tags_out);
+                       par.push(*serverglob);
+                       par.push_last(details.text);
+                       par.Broadcast();
+                       break;
                }
        }
-       else if (target.type == MessageTarget::TYPE_CHANNEL)
-       {
-               Utils->SendChannelMessage(user->uuid, target.Get<Channel>(), details.text, target.status, details.tags_out, details.exemptions, message_type);
-       }
-       else if (target.type == MessageTarget::TYPE_SERVER)
+}
+
+void ModuleSpanningTree::OnUserPostTagMessage(User* user, const MessageTarget& target, const CTCTags::TagMessageDetails& details)
+{
+       if (!IS_LOCAL(user))
+               return;
+
+       switch (target.type)
        {
-               const std::string* serverglob = target.Get<std::string>();
-               CmdBuilder par(user, message_type);
-               par.push_tags(details.tags_out);
-               par.push_back(*serverglob);
-               par.push_last(details.text);
-               par.Broadcast();
+               case MessageTarget::TYPE_USER:
+               {
+                       User* d = target.Get<User>();
+                       if (!IS_LOCAL(d))
+                       {
+                               CmdBuilder params(user, "TAGMSG");
+                               params.push_tags(details.tags_out);
+                               params.push(d->uuid);
+                               params.Unicast(d);
+                       }
+                       break;
+               }
+               case MessageTarget::TYPE_CHANNEL:
+               {
+                       Utils->SendChannelMessage(user, target.Get<Channel>(), "", target.status, details.tags_out, details.exemptions, "TAGMSG");
+                       break;
+               }
+               case MessageTarget::TYPE_SERVER:
+               {
+                       const std::string* serverglob = target.Get<std::string>();
+                       CmdBuilder par(user, "TAGMSG");
+                       par.push_tags(details.tags_out);
+                       par.push(*serverglob);
+                       par.Broadcast();
+                       break;
+               }
        }
 }
 
@@ -441,7 +486,7 @@ void ModuleSpanningTree::OnUserConnect(LocalUser* user)
        for(Extensible::ExtensibleStore::const_iterator i = user->GetExtList().begin(); i != user->GetExtList().end(); i++)
        {
                ExtensionItem* item = i->first;
-               std::string value = item->serialize(FORMAT_NETWORK, user, i->second);
+               std::string value = item->ToNetwork(user, i->second);
                if (!value.empty())
                        ServerInstance->PI->SendMetaData(user, item->name, value);
        }
@@ -468,12 +513,12 @@ void ModuleSpanningTree::OnUserJoin(Membership* memb, bool sync, bool created_by
        else
        {
                CmdBuilder params(memb->user, "IJOIN");
-               params.push_back(memb->chan->name);
+               params.push(memb->chan->name);
                params.push_int(memb->id);
                if (!memb->modes.empty())
                {
-                       params.push_back(ConvToStr(memb->chan->age));
-                       params.push_back(memb->modes);
+                       params.push(ConvToStr(memb->chan->age));
+                       params.push(memb->modes);
                }
                params.Broadcast();
        }
@@ -508,7 +553,7 @@ void ModuleSpanningTree::OnUserPart(Membership* memb, std::string &partmessage,
        if (IS_LOCAL(memb->user))
        {
                CmdBuilder params(memb->user, "PART");
-               params.push_back(memb->chan->name);
+               params.push(memb->chan->name);
                if (!partmessage.empty())
                        params.push_last(partmessage);
                params.Broadcast();
@@ -548,8 +593,8 @@ void ModuleSpanningTree::OnUserPostNick(User* user, const std::string &oldnick)
        {
                // The nick TS is updated by the core, we don't do it
                CmdBuilder params(user, "NICK");
-               params.push_back(user->nick);
-               params.push_back(ConvToStr(user->age));
+               params.push(user->nick);
+               params.push(ConvToStr(user->age));
                params.Broadcast();
        }
        else if (!loopCall)
@@ -564,8 +609,8 @@ void ModuleSpanningTree::OnUserKick(User* source, Membership* memb, const std::s
                return;
 
        CmdBuilder params(source, "KICK");
-       params.push_back(memb->chan->name);
-       params.push_back(memb->user->uuid);
+       params.push(memb->chan->name);
+       params.push(memb->user->uuid);
        // If a remote user is being kicked by us then send the membership id in the kick too
        if (!IS_LOCAL(memb->user))
                params.push_int(memb->id);
@@ -580,8 +625,8 @@ void ModuleSpanningTree::OnPreRehash(User* user, const std::string &parameter)
        // Send out to other servers
        if (!parameter.empty() && parameter[0] != '-')
        {
-               CmdBuilder params((user ? user->uuid : ServerInstance->Config->GetSID()), "REHASH");
-               params.push_back(parameter);
+               CmdBuilder params(user ? user : ServerInstance->FakeClient, "REHASH");
+               params.push(parameter);
                params.Forward(user ? TreeServer::Get(user)->GetRoute() : NULL);
        }
 }
@@ -644,7 +689,7 @@ void ModuleSpanningTree::OnUnloadModule(Module* mod)
                {
                        TreeServer* server = i->second;
                        if (!server->IsRoot())
-                               FOREACH_MOD_CUSTOM(GetEventProvider(), ServerEventListener, OnServerSplit, (server));
+                               FOREACH_MOD_CUSTOM(GetLinkEventProvider(), ServerProtocol::LinkEventListener, OnServerSplit, (server, false));
                }
                return;
        }
@@ -704,8 +749,8 @@ void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
                user = ServerInstance->FakeClient;
 
        CmdBuilder params(user, "DELLINE");
-       params.push_back(x->type);
-       params.push_back(x->Displayable());
+       params.push(x->type);
+       params.push(x->Displayable());
        params.Broadcast();
 }
 
@@ -759,7 +804,7 @@ ModuleSpanningTree::~ModuleSpanningTree()
 {
        ServerInstance->PI = &ServerInstance->DefaultProtocolInterface;
 
-       Server* newsrv = new Server(ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc);
+       Server* newsrv = new Server(ServerInstance->Config->GetSID(), ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc);
        SetLocalUsersServer(newsrv);
 
        delete Utils;