Make kicknorejoin respect /INVITE (#1514).

[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 0d153737fcdcfa38ce8c5a8d3b8dc7d210d277e0..0ff180a8338abfcf9ef6c6831471146fa885348f 100644 (file)
--- a/src/modules/m_spanningtree/main.cpp
+++ b/src/modules/m_spanningtree/main.cpp
@@ -37,7 +37,8 @@
 #include "translate.h"
 
 ModuleSpanningTree::ModuleSpanningTree()
-       : Stats::EventListener(this)
+       : Away::EventListener(this)
+       , Stats::EventListener(this)
        , rconnect(this)
        , rsquit(this)
        , map(this)
@@ -493,12 +494,12 @@ void ModuleSpanningTree::OnChangeHost(User* user, const std::string &newhost)
        CmdBuilder(user, "FHOST").push(newhost).Broadcast();
 }
 
-void ModuleSpanningTree::OnChangeName(User* user, const std::string &gecos)
+void ModuleSpanningTree::OnChangeRealName(User* user, const std::string& real)
 {
        if (user->registered != REG_ALL || !IS_LOCAL(user))
                return;
 
-       CmdBuilder(user, "FNAME").push_last(gecos).Broadcast();
+       CmdBuilder(user, "FNAME").push_last(real).Broadcast();
 }
 
 void ModuleSpanningTree::OnChangeIdent(User* user, const std::string &ident)
@@ -718,15 +719,19 @@ void ModuleSpanningTree::OnDelLine(User* user, XLine *x)
        params.Broadcast();
 }
 
-ModResult ModuleSpanningTree::OnSetAway(User* user, const std::string &awaymsg)
+void ModuleSpanningTree::OnUserAway(User* user)
 {
        if (IS_LOCAL(user))
-               CommandAway::Builder(user, awaymsg).Broadcast();
+               CommandAway::Builder(user).Broadcast();
+}
 
-       return MOD_RES_PASSTHRU;
+void ModuleSpanningTree::OnUserBack(User* user)
+{
+       if (IS_LOCAL(user))
+               CommandAway::Builder(user).Broadcast();
 }
 
-void ModuleSpanningTree::OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags, const std::string& output_mode)
+void ModuleSpanningTree::OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags)
 {
        if (processflags & ModeParser::MODE_LOCALONLY)
                return;
@@ -738,7 +743,7 @@ void ModuleSpanningTree::OnMode(User* source, User* u, Channel* c, const Modes::
 
                CmdBuilder params(source, "MODE");
                params.push(u->uuid);
-               params.push(output_mode);
+               params.push(ClientProtocol::Messages::Mode::ToModeLetters(modes));
                params.push_raw(Translate::ModeChangeListToParams(modes.getlist()));
                params.Broadcast();
        }
@@ -747,7 +752,7 @@ void ModuleSpanningTree::OnMode(User* source, User* u, Channel* c, const Modes::
                CmdBuilder params(source, "FMODE");
                params.push(c->name);
                params.push_int(c->age);
-               params.push(output_mode);
+               params.push(ClientProtocol::Messages::Mode::ToModeLetters(modes));
                params.push_raw(Translate::ModeChangeListToParams(modes.getlist()));
                params.Broadcast();
        }