Support for remote NOTICE/PRIVMSG with server origin and user target

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

diff --git a/src/modules/m_spanningtree/privmsg.cpp b/src/modules/m_spanningtree/privmsg.cpp
index 0aa175c7019b5edeef906f9b68f6d033e7f84839..1752c54f63df1e8d1b0d9a9b252c3cad3667c567 100644 (file)
--- a/src/modules/m_spanningtree/privmsg.cpp
+++ b/src/modules/m_spanningtree/privmsg.cpp
@@ -44,19 +44,42 @@ bool TreeSocket::ServerMessage(const std::string &messagetype, const std::string
                {
                        if (messagetype == "PRIVMSG")
                        {
-                               FOREACH_MOD_I(Instance, I_OnUserMessage, OnUserMessage(NULL, channel, TYPE_SERVER, text, status, except_list));
+                               FOREACH_MOD_I(Instance, I_OnUserMessage, OnUserMessage(NULL, channel, TYPE_CHANNEL, text, status, except_list));
                        }
                        else
                        {
-                               FOREACH_MOD_I(Instance, I_OnUserNotice, OnUserNotice(NULL, channel, TYPE_SERVER, text, status, except_list));
+                               FOREACH_MOD_I(Instance, I_OnUserNotice, OnUserNotice(NULL, channel, TYPE_CHANNEL, text, status, except_list));
                        }
                        TreeServer* s = Utils->FindServer(prefix);
                        if (s)
                        {
-                               FOREACH_MOD_I(Instance, I_OnText, OnText(NULL, channel, TYPE_SERVER, text, status, except_list));
+                               FOREACH_MOD_I(Instance, I_OnText, OnText(NULL, channel, TYPE_CHANNEL, text, status, except_list));
                                channel->WriteChannelWithServ(s->GetName().c_str(), "%s %s :%s", messagetype.c_str(), channel->name, text.c_str());
                        }
                }
+               else
+               {
+                       User* user = Instance->FindNick(target);
+                       
+                       if (user)
+                       {
+                               if (messagetype == "PRIVMSG")
+                               {
+                                       FOREACH_MOD_I(Instance, I_OnUserMessage, OnUserMessage(NULL, user, TYPE_USER, text, 0, except_list));
+                               }
+                               else
+                               {
+                                       FOREACH_MOD_I(Instance, I_OnUserNotice, OnUserNotice(NULL, user, TYPE_USER, text, 0, except_list));
+                               }
+                               TreeServer* s = Utils->FindServer(prefix);
+                               if (s)
+                               {
+                                       FOREACH_MOD_I(Instance, I_OnText, OnText(NULL, user, TYPE_USER, text, status, except_list));
+                                       user->Write(":%s %s %s :%s", s->GetName().c_str(), messagetype.c_str(), user->nick, text.c_str());
+                               }
+
+                       }
+               }
 
                /* Propogate as channel privmsg */
                return Utils->DoOneToAllButSenderRaw(":" + prefix + " " + messagetype + " " + channel->name + " :" + text, sourceserv, prefix, assign(messagetype), params);