Merge branch 'master+echomessage-invitenotify'

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

diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h
index f25370b93ae905911fa92a302d7a532c0d6a9f17..d29609a35fac7e4cbc2e647054195f20f6072b1d 100644 (file)
--- a/src/modules/m_spanningtree/main.h
+++ b/src/modules/m_spanningtree/main.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include "inspircd.h"
+#include "event.h"
 #include "modules/dns.h"
 #include "servercommand.h"
 #include "commands.h"
@@ -72,6 +73,10 @@ class ModuleSpanningTree : public Module
         */
        SpanningTreeProtocolInterface protocolinterface;
 
+       /** Event provider for our events
+        */
+       Events::ModuleEventProvider eventprov;
+
  public:
        dynamic_reference<DNS::Manager> DNS;
 
@@ -82,10 +87,6 @@ class ModuleSpanningTree : public Module
         */
        bool loopCall;
 
-       /** True if users are quitting due to a netsplit
-        */
-       bool SplitInProgress;
-
        /** Constructor
         */
        ModuleSpanningTree();
@@ -107,10 +108,6 @@ class ModuleSpanningTree : public Module
         */
        ModResult HandleRemoteWhois(const std::vector<std::string>& parameters, User* user);
 
-       /** Ping all local servers
-        */
-       void DoPingChecks(time_t curtime);
-
        /** Connect a server locally
         */
        void ConnectServer(Link* x, Autoconnect* y = NULL);
@@ -143,6 +140,8 @@ class ModuleSpanningTree : public Module
         */
        static std::string TimeToStr(time_t secs);
 
+       const Events::ModuleEventProvider& GetEventProvider() const { return eventprov; }
+
        /**
         ** *** MODULE EVENTS ***
         **/
@@ -150,7 +149,7 @@ class ModuleSpanningTree : public Module
        ModResult OnPreCommand(std::string &command, std::vector<std::string>& parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE;
        void OnPostCommand(Command*, const std::vector<std::string>& parameters, LocalUser* user, CmdResult result, const std::string& original_line) CXX11_OVERRIDE;
        void OnUserConnect(LocalUser* source) CXX11_OVERRIDE;
-       void OnUserInvite(User* source,User* dest,Channel* channel, time_t) CXX11_OVERRIDE;
+       void OnUserInvite(User* source, User* dest, Channel* channel, time_t timeout, unsigned int notifyrank, CUList& notifyexcepts) CXX11_OVERRIDE;
        void OnPostTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE;
        void OnUserMessage(User* user, void* dest, int target_type, const std::string& text, char status, const CUList& exempt_list, MessageType msgtype) CXX11_OVERRIDE;
        void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE;
@@ -172,6 +171,7 @@ class ModuleSpanningTree : public Module
        void OnLoadModule(Module* mod) CXX11_OVERRIDE;
        void OnUnloadModule(Module* mod) CXX11_OVERRIDE;
        ModResult OnAcceptConnection(int newsock, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE;
+       void OnMode(User* source, User* u, Channel* c, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags, const std::string& output_mode) CXX11_OVERRIDE;
        CullResult cull();
        ~ModuleSpanningTree();
        Version GetVersion() CXX11_OVERRIDE;