Added support for NOTICE

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

diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp
index 5097980ad6e4e19f2e26753d7e3181016670a2ac..cd35e824d882e20a3005d2a772e5874d2df2e5a9 100644 (file)
--- a/src/modules/m_spanningtree.cpp
+++ b/src/modules/m_spanningtree.cpp
@@ -53,6 +53,7 @@ class TreeSocket;
 bool DoOneToOne(std::string prefix, std::string command, std::deque<std::string> params, std::string target);
 bool DoOneToAllButSender(std::string prefix, std::string command, std::deque<std::string> params, std::string omit);
 bool DoOneToMany(std::string prefix, std::string command, std::deque<std::string> params);
+bool DoOneToAllButSenderRaw(std::string data,std::string omit);
 
 class TreeServer
 {
@@ -624,6 +625,7 @@ class TreeSocket : public InspSocket
                }
                TreeServer* Node = new TreeServer(servername,description,ParentOfThis,NULL);
                ParentOfThis->AddChild(Node);
+               params[3] = ":" + params[3];
                DoOneToAllButSender(prefix,"SERVER",params,prefix);
                Srv->SendOpers("*** Server \002"+prefix+"\002 introduced server \002"+servername+"\002 ("+description+")");
                return true;
@@ -697,7 +699,7 @@ class TreeSocket : public InspSocket
                return false;
        }
 
-       std::deque<std::string> Split(std::string line)
+       std::deque<std::string> Split(std::string line, bool stripcolon)
        {
                std::deque<std::string> n;
                std::stringstream s(line);
@@ -732,8 +734,7 @@ class TreeSocket : public InspSocket
        bool ProcessLine(std::string line)
        {
                Srv->Log(DEBUG,"inbound-line: '"+line+"'");
-
-               std::deque<std::string> params = this->Split(line);
+               std::deque<std::string> params = this->Split(line,true);
                std::string command = "";
                std::string prefix = "";
                if (((params[0].c_str())[0] == ':') && (params.size() > 1))
@@ -875,7 +876,7 @@ class TreeSocket : public InspSocket
                                                        return true;
                                                }
                                        }
-                                       return DoOneToAllButSender(prefix,command,params,sourceserv);
+                                       return DoOneToAllButSenderRaw(line,sourceserv);
 
                                }
                                return true;
@@ -921,6 +922,21 @@ class TreeSocket : public InspSocket
        }
 };
 
+bool DoOneToAllButSenderRaw(std::string data,std::string omit)
+{
+       for (unsigned int x = 0; x < TreeRoot->ChildCount(); x++)
+       {
+               TreeServer* Route = TreeRoot->GetChild(x);
+               if ((Route->GetSocket()) && (Route->GetName() != omit) && (BestRouteTo(omit) != Route))
+               {
+                       TreeSocket* Sock = Route->GetSocket();
+                       log(DEBUG,"Sending RAW to %s",Route->GetName().c_str());
+                       Sock->WriteLine(data);
+               }
+       }
+       return true;
+}
+
 bool DoOneToAllButSender(std::string prefix, std::string command, std::deque<std::string> params, std::string omit)
 {
        log(DEBUG,"ALLBUTONE: Comes from %s SHOULD NOT go back to %s",prefix.c_str(),omit.c_str());
@@ -1209,6 +1225,33 @@ class ModuleSpanningTree : public Module
                return 0;
        }
 
+       virtual void OnUserNotice(userrec* user, void* dest, int target_type, std::string text)
+       {
+               if (target_type == TYPE_USER)
+               {
+                       userrec* d = (userrec*)dest;
+                       if ((std::string(d->server) != Srv->GetServerName()) && (std::string(user->server) == Srv->GetServerName()))
+                       {
+                               std::deque<std::string> params;
+                               params.clear();
+                               params.push_back(d->nick);
+                               params.push_back(":"+text);
+                               DoOneToOne(user->nick,"NOTICE",params,d->server);
+                       }
+               }
+               else
+               {
+                       if (std::string(user->server) == Srv->GetServerName())
+                       {
+                               chanrec *c = (chanrec*)dest;
+                               std::deque<std::string> params;
+                               params.push_back(c->name);
+                               params.push_back(":"+text);
+                               DoOneToMany(user->nick,"NOTICE",params);
+                       }
+               }
+       }
+
        virtual void OnUserMessage(userrec* user, void* dest, int target_type, std::string text)
        {
                if (target_type == TYPE_USER)
@@ -1227,28 +1270,13 @@ class ModuleSpanningTree : public Module
                }
                else
                {
-                       chanrec* c = (chanrec*)dest;
-                       std::deque<std::string> params;
-                       std::vector<std::string> wlist;
-                       params.clear();
-                       wlist.clear();
-                       params.push_back(c->name);
-                       params.push_back(":"+text);
-                       std::vector<char*> *ulist = c->GetUsers();
-                       for (unsigned int j = 0; j < ulist->size(); j++)
+                       if (std::string(user->server) == Srv->GetServerName())
                        {
-                               char* o = (*ulist)[j];
-                               userrec* otheruser = (userrec*)o;
-                               if (strcasecmp(otheruser->server,Srv->GetServerName().c_str()))
-                               {
-                                       // this user is on another server.
-                                       // Write that server, then mark that server so we dont write to it again.
-                                       if (find(wlist.begin(),wlist.end(),otheruser->server) == wlist.end())
-                                       {
-                                               DoOneToOne(user->nick,"PRIVMSG",params,otheruser->server);
-                                               wlist.push_back(otheruser->server);
-                                       }
-                               }
+                               chanrec *c = (chanrec*)dest;
+                               std::deque<std::string> params;
+                               params.push_back(c->name);
+                               params.push_back(":"+text);
+                               DoOneToMany(user->nick,"PRIVMSG",params);
                        }
                }
        }