diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/m_banredirect.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.cpp | 7 | ||||
| -rw-r--r-- | src/modules/m_spanningtree/main.h | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/modules/m_banredirect.cpp b/src/modules/m_banredirect.cpp index 6517da0a2..56be984b6 100644 --- a/src/modules/m_banredirect.cpp +++ b/src/modules/m_banredirect.cpp @@ -258,7 +258,7 @@ class ModuleBanRedirect : public Module ExceptionModule = ServerInstance->Modules->Find("m_banexception.so"); } - virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, bool synching = false) + virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs) { /* This prevents recursion when a user sets multiple ban redirects in a chain * (thanks Potter) diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index b6c6fc1ec..62458e9a1 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -436,13 +436,14 @@ void ModuleSpanningTree::OnGetServerDescription(const std::string &servername,st } } -void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel) +void ModuleSpanningTree::OnUserInvite(User* source,User* dest,Channel* channel, time_t expiry) { if (IS_LOCAL(source)) { std::deque<std::string> params; params.push_back(dest->uuid); params.push_back(channel->name); + params.push_back(ConvToStr(expiry)); Utils->DoOneToMany(source->uuid,"INVITE",params); } } @@ -760,7 +761,7 @@ void ModuleSpanningTree::OnOper(User* user, const std::string &opertype) } } -void ModuleSpanningTree::OnAddLine(XLine* x, User* user) +void ModuleSpanningTree::OnAddLine(User* user, XLine *x) { if (x->type == "K") return; @@ -783,7 +784,7 @@ void ModuleSpanningTree::OnAddLine(XLine* x, User* user) } } -void ModuleSpanningTree::OnDelLine(XLine* x, User* user) +void ModuleSpanningTree::OnDelLine(User* user, XLine *x) { if (x->type == "K") return; diff --git a/src/modules/m_spanningtree/main.h b/src/modules/m_spanningtree/main.h index 6a5fe32dd..5eeaca7b1 100644 --- a/src/modules/m_spanningtree/main.h +++ b/src/modules/m_spanningtree/main.h @@ -160,7 +160,7 @@ class ModuleSpanningTree : public Module virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line); virtual void OnPostCommand(const std::string &command, const char** parameters, int pcnt, User *user, CmdResult result, const std::string &original_line); virtual void OnGetServerDescription(const std::string &servername,std::string &description); - virtual void OnUserInvite(User* source,User* dest,Channel* channel); + virtual void OnUserInvite(User* source,User* dest,Channel* channel, time_t); virtual void OnPostLocalTopicChange(User* user, Channel* chan, const std::string &topic); virtual void OnWallops(User* user, const std::string &text); virtual void OnUserNotice(User* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list); @@ -178,8 +178,8 @@ class ModuleSpanningTree : public Module virtual void OnRehash(User* user, const std::string ¶meter); virtual void OnOper(User* user, const std::string &opertype); void OnLine(User* source, const std::string &host, bool adding, char linetype, long duration, const std::string &reason); - virtual void OnAddLine(XLine* line, User* user); - virtual void OnDelLine(XLine* line, User* user); + virtual void OnAddLine(User *u, XLine *x); + virtual void OnDelLine(User *u, XLine *x); virtual void OnMode(User* user, void* dest, int target_type, const std::string &text); virtual int OnStats(char statschar, User* user, string_list &results); virtual void OnSetAway(User* user); |