diff options
| -rw-r--r-- | src/modules/extra/m_httpclienttest.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_chancreate.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_chanprotect.cpp | 6 | ||||
| -rw-r--r-- | src/modules/m_foobar.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_httpd_stats.cpp | 4 | ||||
| -rw-r--r-- | src/modules/m_joinflood.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_kicknorejoin.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_testcommand.cpp | 6 |
8 files changed, 12 insertions, 18 deletions
diff --git a/src/modules/extra/m_httpclienttest.cpp b/src/modules/extra/m_httpclienttest.cpp index 54ebe7e3b..9e43379c1 100644 --- a/src/modules/extra/m_httpclienttest.cpp +++ b/src/modules/extra/m_httpclienttest.cpp @@ -41,7 +41,7 @@ public: return Version(1,0,0,1,VF_VENDOR,API_VERSION); } - virtual void OnUserJoin(userrec* user, chanrec* channel) + virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) { // method called when a user joins a channel @@ -68,7 +68,7 @@ public: return NULL; } - virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) + virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { } diff --git a/src/modules/m_chancreate.cpp b/src/modules/m_chancreate.cpp index 0cd9a5f03..fdd8e3576 100644 --- a/src/modules/m_chancreate.cpp +++ b/src/modules/m_chancreate.cpp @@ -44,7 +44,7 @@ class ModuleChanCreate : public Module List[I_OnUserJoin] = 1; } - virtual void OnUserJoin(userrec* user, chanrec* channel) + virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) { if (channel->GetUserCounter() == 1) { diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 766898c5a..3f44fd93e 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -323,14 +323,14 @@ class ModuleChanProtect : public Module List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1; } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) { // FIX: when someone gets kicked from a channel we must remove their Extensibles! user->Shrink("cm_founder_"+std::string(chan->name)); user->Shrink("cm_protect_"+std::string(chan->name)); } - virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason) + virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason, bool &silent) { // FIX: when someone parts a channel we must remove their Extensibles! user->Shrink("cm_founder_"+std::string(channel->name)); @@ -372,7 +372,7 @@ class ModuleChanProtect : public Module } } - virtual void OnUserJoin(userrec* user, chanrec* channel) + virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) { // if the user is the first user into the channel, mark them as the founder, but only if // the config option for it is set diff --git a/src/modules/m_foobar.cpp b/src/modules/m_foobar.cpp index deb4c1229..a42275127 100644 --- a/src/modules/m_foobar.cpp +++ b/src/modules/m_foobar.cpp @@ -74,7 +74,7 @@ class ModuleFoobar : public Module ServerInstance->Log(DEBUG,"Foobar: User quitting: "+b); } - virtual void OnUserJoin(userrec* user, chanrec* channel) + virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) { // method called when a user joins a channel @@ -83,7 +83,7 @@ class ModuleFoobar : public Module ServerInstance->Log(DEBUG,"Foobar: User "+b+" joined "+c); } - virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason) + virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason, bool &silent) { // method called when a user parts a channel diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index ac49fccf8..a72c94c47 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -178,7 +178,7 @@ class ModuleHttpStats : public Module this->changed = true; } - void OnUserJoin(userrec* user, chanrec* channel) + void OnUserJoin(userrec* user, chanrec* channel, bool &silent) { StatsIter a = sh->find(channel->name); if (a != sh->end()) @@ -193,7 +193,7 @@ class ModuleHttpStats : public Module this->changed = true; } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage) + void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) { StatsIter a = sh->find(channel->name); if (a != sh->end()) diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index ed67a880a..358f3e08c 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -243,7 +243,7 @@ class ModuleJoinFlood : public Module return 0; } - virtual void OnUserJoin(userrec* user, chanrec* channel) + virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) { joinfloodsettings *f; if (channel->GetExt("joinflood",f)) diff --git a/src/modules/m_kicknorejoin.cpp b/src/modules/m_kicknorejoin.cpp index 4bb9f9dc1..87e8646ec 100644 --- a/src/modules/m_kicknorejoin.cpp +++ b/src/modules/m_kicknorejoin.cpp @@ -177,7 +177,7 @@ public: return 0; } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) { if (chan->IsModeSet('J') && (source != user)) { diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp index a3ae7aedf..015c8b1df 100644 --- a/src/modules/m_testcommand.cpp +++ b/src/modules/m_testcommand.cpp @@ -90,14 +90,8 @@ class ModuleTestCommand : public Module void Implements(char* List) { - List[I_OnUserJoin] = 1; } - virtual void OnUserJoin(userrec* user, chanrec* channel) - { - /* This is an example, we do nothing here */ - } - virtual ~ModuleTestCommand() { delete newcommand; |