diff options
Diffstat (limited to 'src/modules/m_channelban.cpp')
| -rw-r--r-- | src/modules/m_channelban.cpp | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/modules/m_channelban.cpp b/src/modules/m_channelban.cpp index def17bdb5..8caae0a96 100644 --- a/src/modules/m_channelban.cpp +++ b/src/modules/m_channelban.cpp @@ -21,7 +21,7 @@ class ModuleBadChannelExtban : public Module public: ModuleBadChannelExtban(InspIRCd* Me) : Module(Me) { - Implementation eventlist[] = { I_OnUserPreJoin, I_On005Numeric }; + Implementation eventlist[] = { I_OnCheckBan, I_On005Numeric }; ServerInstance->Modules->Attach(eventlist, this, 2); } @@ -34,25 +34,15 @@ class ModuleBadChannelExtban : public Module return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION); } - virtual int OnUserPreJoin(User *user, Channel *c, const char *cname, std::string &privs, const std::string &key) + virtual int OnCheckBan(User *user, Channel *c) { - if (!IS_LOCAL(user)) - return 0; - - if (!c) - return 0; - - + int rv = 0; for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++) { - if (c->IsExtBanned(i->first->name, 'j')) - { - user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(), c->name.c_str()); - return 1; - } + rv = banmatch_reduce(rv, c->GetExtBanStatus(i->first->name, 'j')); } - return 0; + return rv; } virtual void On005Numeric(std::string &output) |