m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

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

diff --git a/src/modules/m_ircv3.cpp b/src/modules/m_ircv3.cpp
index 166bbbea70cfd937a5253a2e00afb20e778b4881..59a69f6691ede180a2a43afa50e1ec8056618714 100644 (file)
--- a/src/modules/m_ircv3.cpp
+++ b/src/modules/m_ircv3.cpp
@@ -16,11 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $ModDesc: Provides support for extended-join, away-notify and account-notify CAP capabilities */
-
 #include "inspircd.h"
-#include "account.h"
-#include "m_cap.h"
+#include "modules/account.h"
+#include "modules/cap.h"
 
 class ModuleIRCv3 : public Module
 {
@@ -38,7 +36,7 @@ class ModuleIRCv3 : public Module
                UserChanList chans(user->chans);
 
                std::map<User*, bool> exceptions;
-               FOREACH_MOD(I_OnBuildNeighborList, OnBuildNeighborList(user, chans, exceptions));
+               FOREACH_MOD(OnBuildNeighborList, (user, chans, exceptions));
 
                // Send it to all local users who were explicitly marked as neighbours by modules and have the required ext
                for (std::map<User*, bool>::const_iterator i = exceptions.begin(); i != exceptions.end(); ++i)
@@ -78,14 +76,12 @@ class ModuleIRCv3 : public Module
        {
        }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                OnRehash(NULL);
-               Implementation eventlist[] = { I_OnUserJoin, I_OnPostJoin, I_OnSetAway, I_OnEvent, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
-       void OnRehash(User* user)
+       void OnRehash(User* user) CXX11_OVERRIDE
        {
                ConfigTag* conf = ServerInstance->Config->ConfValue("ircv3");
                accountnotify = conf->getBool("accoutnotify", true);
@@ -93,7 +89,7 @@ class ModuleIRCv3 : public Module
                extendedjoin = conf->getBool("extendedjoin", true);
        }
 
-       void OnEvent(Event& ev)
+       void OnEvent(Event& ev) CXX11_OVERRIDE
        {
                if (awaynotify)
                        cap_awaynotify.HandleEvent(ev);
@@ -122,10 +118,10 @@ class ModuleIRCv3 : public Module
                }
        }
 
-       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
+       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE
        {
                // Remember who is not going to see the JOIN because of other modules
-               if ((awaynotify) && (IS_AWAY(memb->user)))
+               if ((awaynotify) && (memb->user->IsAway()))
                        last_excepts = excepts;
 
                if (!extendedjoin)
@@ -195,7 +191,7 @@ class ModuleIRCv3 : public Module
                }
        }
 
-       ModResult OnSetAway(User* user, const std::string &awaymsg)
+       ModResult OnSetAway(User* user, const std::string &awaymsg) CXX11_OVERRIDE
        {
                if (awaynotify)
                {
@@ -210,9 +206,9 @@ class ModuleIRCv3 : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnPostJoin(Membership *memb)
+       void OnPostJoin(Membership *memb) CXX11_OVERRIDE
        {
-               if ((!awaynotify) || (!IS_AWAY(memb->user)))
+               if ((!awaynotify) || (!memb->user->IsAway()))
                        return;
 
                std::string line = ":" + memb->user->GetFullHost() + " AWAY :" + memb->user->awaymsg;
@@ -236,7 +232,7 @@ class ModuleIRCv3 : public Module
                ServerInstance->Modules->SetPriority(this, I_OnUserJoin, PRIORITY_LAST);
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for extended-join, away-notify and account-notify CAP capabilities", VF_VENDOR);
        }