X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=82c4e6940c330e6f8022d2c06cf763a811825c56;hb=ce168051e23bf7a33410ad17a4b78f5da478dbbe;hp=68a4afb9f2cb5fdfe6ab4c1a1b7cf3b5d1a4c0e6;hpb=7775a195d9c417e52eaaf912ec51d62bf0fd9a54;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 68a4afb9f..82c4e6940 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -2,40 +2,44 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" #include "inspircd.h" -#include "commands.h" /* $ModDesc: Provides channel modes +a and +q */ +#define PROTECT_VALUE 40000 +#define FOUNDER_VALUE 50000 - -const char* fakevalue = "on"; - -class ChanFounder : public ModeHandler +/** Handles basic operation of +qa channel modes + */ +class FounderProtectBase { - char* dummyptr; + private: + InspIRCd* MyInstance; + std::string extend; + std::string type; + int list; + int end; + protected: + bool& remove_own_privs; + bool& remove_other_privs; public: - ChanFounder(InspIRCd* Instance) : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false) { } + FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others) : + MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others) + { + } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - userrec* x = ServerInstance->FindNick(parameter); + User* x = MyInstance->FindNick(parameter); if (x) { if (!channel->HasUser(x)) @@ -44,8 +48,8 @@ class ChanFounder : public ModeHandler } else { - std::string founder = "cm_founder_"+std::string(channel->name); - if (x->GetExt(founder,dummyptr)) + std::string item = extend+std::string(channel->name); + if (x->GetExt(item)) { return std::make_pair(true, x->nick); } @@ -58,186 +62,225 @@ class ChanFounder : public ModeHandler return std::make_pair(false, parameter); } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + void RemoveMode(Channel* channel, char mc, irc::modestacker* stack) { - userrec* theuser = ServerInstance->FindNick(parameter); - - ServerInstance->Log(DEBUG,"ChanFounder::OnModeChange"); - - // cant find the user given as the parameter, eat the mode change. - if (!theuser) - { - ServerInstance->Log(DEBUG,"No such user in ChanFounder"); - parameter = ""; - return MODEACTION_DENY; - } + CUList* cl = channel->GetUsers(); + std::string item = extend + std::string(channel->name); + std::vector mode_junk; + mode_junk.push_back(channel->name); + irc::modestacker modestack(false); + std::deque stackresult; - // given user isnt even on the channel, eat the mode change - if (!channel->HasUser(theuser)) + for (CUList::iterator i = cl->begin(); i != cl->end(); i++) { - ServerInstance->Log(DEBUG,"Channel doesn't have user in ChanFounder"); - parameter = ""; - return MODEACTION_DENY; + if (i->first->GetExt(item)) + { + if (stack) + stack->Push(mc, i->first->nick); + else + modestack.Push(mc, i->first->nick); + } } - std::string protect = "cm_protect_"+std::string(channel->name); - std::string founder = "cm_founder_"+std::string(channel->name); + if (stack) + return; - // source is a server, or ulined, we'll let them +-q the user. - if ((ServerInstance->is_uline(source->nick)) || (ServerInstance->is_uline(source->server)) || (!*source->server) || (!IS_LOCAL(source))) + while (modestack.GetStackedLine(stackresult)) { - ServerInstance->Log(DEBUG,"Allowing remote mode change in ChanFounder"); - if (adding) - { - if (!theuser->GetExt(founder,dummyptr)) - { - ServerInstance->Log(DEBUG,"Does not have the ext item in ChanFounder"); - if (!theuser->Extend(founder,fakevalue)) - ServerInstance->Log(DEBUG,"COULD NOT EXTEND!!!"); - // Tidy the nickname (make case match etc) - parameter = theuser->nick; - if (theuser->GetExt(founder, dummyptr)) - ServerInstance->Log(DEBUG,"Extended!"); - else - ServerInstance->Log(DEBUG,"Not extended :("); - return MODEACTION_ALLOW; - } - } - else + for (size_t j = 0; j < stackresult.size(); j++) { - if (theuser->GetExt(founder, dummyptr)) - { - theuser->Shrink(founder); - // Tidy the nickname (make case match etc) - parameter = theuser->nick; - return MODEACTION_ALLOW; - } + mode_junk.push_back(stackresult[j]); } - return MODEACTION_DENY; - } - else - { - // whoops, someones being naughty! - source->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name); - parameter = ""; - return MODEACTION_DENY; + MyInstance->SendMode(mode_junk, MyInstance->FakeClient); } } - void DisplayList(userrec* user, chanrec* channel) + void DisplayList(User* user, Channel* channel) { CUList* cl = channel->GetUsers(); - std::string founder = "cm_founder_"+std::string(channel->name); - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) + std::string item = extend+std::string(channel->name); + for (CUList::reverse_iterator i = cl->rbegin(); i != cl->rend(); ++i) { - if (i->second->GetExt(founder, dummyptr)) + if (i->first->GetExt(item)) { - user->WriteServ("386 %s %s %s",user->nick, channel->name,i->second->nick); + user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->first->nick); } } - user->WriteServ("387 %s %s :End of channel founder list",user->nick, channel->name); + user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str()); } -}; + User* FindAndVerify(std::string ¶meter, Channel* channel) + { + User* theuser = MyInstance->FindNick(parameter); + if ((!theuser) || (!channel->HasUser(theuser))) + { + parameter.clear(); + return NULL; + } + return theuser; + } -class ChanProtect : public ModeHandler -{ - char* dummyptr; - public: - ChanProtect(InspIRCd* Instance) : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false) { } + bool CanRemoveOthers(User* u1, User* u2, Channel* c) + { + std::string item = extend+std::string(c->name); + return (u1->GetExt(item) && u2->GetExt(item)); + } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter) { - userrec* x = ServerInstance->FindNick(parameter); - if (x) + std::string item = extend+std::string(channel->name); + + if (adding) { - if (!channel->HasUser(x)) + if (!theuser->GetExt(item)) { - return std::make_pair(false, parameter); + theuser->Extend(item); + parameter = theuser->nick; + return MODEACTION_ALLOW; } - else + } + else + { + if (theuser->GetExt(item)) { - std::string founder = "cm_protect_"+std::string(channel->name); - if (x->GetExt(founder,dummyptr)) - { - return std::make_pair(true, x->nick); - } - else - { - return std::make_pair(false, parameter); - } + theuser->Shrink(item); + parameter = theuser->nick; + return MODEACTION_ALLOW; } } - return std::make_pair(false, parameter); + return MODEACTION_DENY; } +}; - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) +/** Abstraction of FounderProtectBase for channel mode +q + */ +class ChanFounder : public ModeHandler, public FounderProtectBase +{ + public: + ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others) + : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0), + FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others) { } + + unsigned int GetPrefixRank() + { + return FOUNDER_VALUE; + } + + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + { + return FounderProtectBase::ModeSet(source, dest, channel, parameter); + } + + void RemoveMode(Channel* channel, irc::modestacker* stack) { - userrec* theuser = ServerInstance->FindNick(parameter); + FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack); + } + + void RemoveMode(User* user, irc::modestacker* stack) + { + } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + { + User* theuser = FounderProtectBase::FindAndVerify(parameter, channel); - // cant find the user given as the parameter, eat the mode change. if (!theuser) { - parameter = ""; return MODEACTION_DENY; } - // given user isnt even on the channel, eat the mode change - if (!channel->HasUser(theuser)) + if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel)) + { + return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); + } + // source is a server, or ulined, we'll let them +-q the user. + if (source == ServerInstance->FakeClient || + ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || + (ServerInstance->ULine(source->nick)) || + (ServerInstance->ULine(source->server)) || + (!*source->server) || + (!IS_LOCAL(source))) + { + return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); + } + else { - parameter = ""; + // whoops, someones being naughty! + source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q",source->nick, channel->name); + parameter.clear(); return MODEACTION_DENY; } + } + + void DisplayList(User* user, Channel* channel) + { + FounderProtectBase::DisplayList(user,channel); + } +}; + +/** Abstraction of FounderProtectBase for channel mode +a + */ +class ChanProtect : public ModeHandler, public FounderProtectBase +{ + public: + ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others) + : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0), + FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others) { } + + unsigned int GetPrefixRank() + { + return PROTECT_VALUE; + } + + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + { + return FounderProtectBase::ModeSet(source, dest, channel, parameter); + } + + void RemoveMode(Channel* channel, irc::modestacker* stack) + { + FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack); + } + + void RemoveMode(User* user, irc::modestacker* stack) + { + } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + { + User* theuser = FounderProtectBase::FindAndVerify(parameter, channel); + + if (!theuser) + return MODEACTION_DENY; - std::string protect = "cm_protect_"+std::string(channel->name); std::string founder = "cm_founder_"+std::string(channel->name); + if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel)) + { + return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); + } // source has +q, is a server, or ulined, we'll let them +-a the user. - if ((ServerInstance->is_uline(source->nick)) || (ServerInstance->is_uline(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source))) + if (source == ServerInstance->FakeClient || + ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || + (ServerInstance->ULine(source->nick)) || + (ServerInstance->ULine(source->server)) || + (!*source->server) || + (source->GetExt(founder)) || + (!IS_LOCAL(source))) { - if (adding) - { - if (!theuser->GetExt(protect,dummyptr)) - { - theuser->Extend(protect,fakevalue); - // Tidy the nickname (make case match etc) - parameter = theuser->nick; - return MODEACTION_ALLOW; - } - } - else - { - if (theuser->GetExt(protect,dummyptr)) - { - theuser->Shrink(protect); - // Tidy the nickname (make case match etc) - parameter = theuser->nick; - return MODEACTION_ALLOW; - } - } - return MODEACTION_DENY; + return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } else { // bzzzt, wrong answer! - source->WriteServ("482 %s %s :You are not a channel founder",source->nick, channel->name); + source->WriteNumeric(482, "%s %s :You are not a channel founder",source->nick, channel->name); return MODEACTION_DENY; } } - virtual void DisplayList(userrec* user, chanrec* channel) + virtual void DisplayList(User* user, Channel* channel) { - CUList* cl = channel->GetUsers(); - std::string protect = "cm_protect_"+std::string(channel->name); - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) - { - if (i->second->GetExt(protect,dummyptr)) - { - user->WriteServ("388 %s %s %s",user->nick, channel->name,i->second->nick); - } - } - user->WriteServ("389 %s %s :End of channel protected user list",user->nick, channel->name); + FounderProtectBase::DisplayList(user, channel); } }; @@ -246,51 +289,54 @@ class ModuleChanProtect : public Module { bool FirstInGetsFounder; + char QPrefix; + char APrefix; + bool DeprivSelf; + bool DeprivOthers; + bool booting; ChanProtect* cp; ChanFounder* cf; - char* dummyptr; public: - ModuleChanProtect(InspIRCd* Me) : Module::Module(Me) - { + ModuleChanProtect(InspIRCd* Me) + : Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true), cp(NULL), cf(NULL) + { + /* Load config stuff */ + LoadSettings(); + booting = false; + /* Initialise module variables */ - cp = new ChanProtect(ServerInstance); - cf = new ChanFounder(ServerInstance); + cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers); + cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers); - ServerInstance->AddMode(cp, 'a'); - ServerInstance->AddMode(cf, 'q'); - - /* Load config stuff */ - OnRehash(""); - } + if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf)) + { + delete cp; + delete cf; + throw ModuleException("Could not add new modes!"); + } - void Implements(char* List) - { - List[I_On005Numeric] = List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1; - } - - virtual void On005Numeric(std::string &output) - { - ServerInstance->ModeGrok->InsertMode(output,"qa",1); + Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck }; + ServerInstance->Modules->Attach(eventlist, this, 5); } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + virtual void OnUserKick(User* source, User* user, Channel* 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(User* user, Channel* 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)); user->Shrink("cm_protect_"+std::string(channel->name)); } - virtual void OnRehash(const std::string ¶meter) + void LoadSettings() { /* Create a configreader class and read our flag, * in old versions this was heap-allocated and the @@ -298,42 +344,58 @@ class ModuleChanProtect : public Module * stack-allocate it locally. */ ConfigReader Conf(ServerInstance); - - FirstInGetsFounder = Conf.ReadFlag("options","noservices",0); + + FirstInGetsFounder = Conf.ReadFlag("options", "noservices", 0); + + std::string qpre = Conf.ReadValue("options", "qprefix", 0); + QPrefix = qpre.empty() ? 0 : qpre[0]; + + std::string apre = Conf.ReadValue("options", "aprefix", 0); + APrefix = apre.empty() ? 0 : apre[0]; + + if ((APrefix && QPrefix) && APrefix == QPrefix) + throw ModuleException("What the smeg, why are both your +q and +a prefixes the same character?"); + + if (cp && ServerInstance->Modes->FindPrefix(APrefix) == cp) + throw ModuleException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another."); + + if (cf && ServerInstance->Modes->FindPrefix(QPrefix) == cf) + throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another."); + + DeprivSelf = Conf.ReadFlag("options","deprotectself",0); + DeprivOthers = Conf.ReadFlag("options","deprotectothers",0); } - virtual void OnUserJoin(userrec* user, chanrec* channel) + virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven) { // 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 - if (FirstInGetsFounder) - { - if (channel->GetUserCounter() == 1) - { - // we're using Extensible::Extend to add data into user objects. - // this way is best as it adds data thats accessible to other modules - // (so long as you document your code properly) without breaking anything - // because its encapsulated neatly in a map. - - // Change requested by katsklaw... when the first in is set to get founder, - // to make it clearer that +q has been given, send that one user the +q notice - // so that their client's syncronization and their sanity are left intact. - user->WriteServ("MODE %s +q %s",channel->name,user->nick); - if (user->Extend("cm_founder_"+std::string(channel->name),fakevalue)) - { - ServerInstance->Log(DEBUG,"Marked user "+std::string(user->nick)+" as founder for "+std::string(channel->name)); - } - } - } + + if (FirstInGetsFounder && !chan) + privs = QPrefix + "@"; + + return 0; } - virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) + virtual void OnPostJoin(User *user, Channel *channel) + { + // This *must* be in PostJoin, not UserJoin - the former will make it appear to happen + // before the client is in the channel + + // This notice was here originally because it was all done prior to the creation of + // privs in OnUserPreJoin. I've left it because it might still be wanted, but i'm + // not sure it really should be here - ops don't get shown, obviously, and the prefix + // will appear in the names list for the user.. remove if desired -Special + + if (FirstInGetsFounder && channel->GetUserCounter() == 1) + user->WriteServ("MODE %s +q %s", channel->name, user->nick); + } + + virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) { // here we perform access checks, this is the important bit that actually stops kicking/deopping // etc of protected users. There are many types of access check, we're going to handle // a relatively small number of them relevent to our module using a switch statement. - - ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck %d",access_type); // don't allow action if: // (A) Theyre founder (no matter what) // (B) Theyre protected, and you're not @@ -343,10 +405,8 @@ class ModuleChanProtect : public Module // firstly, if a ulined nick, or a server, is setting the mode, then allow them to set the mode // without any access checks, we're not worthy :p - if ((ServerInstance->is_uline(source->nick)) || (ServerInstance->is_uline(source->server)) || (!*source->server)) - { + if ((ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server)) return ACR_ALLOW; - } std::string founder = "cm_founder_"+std::string(channel->name); std::string protect = "cm_protect_"+std::string(channel->name); @@ -355,63 +415,56 @@ class ModuleChanProtect : public Module { // a user has been deopped. Do we let them? hmmm... case AC_DEOP: - ServerInstance->Log(DEBUG,"OnAccessCheck AC_DEOP"); - if (dest->GetExt(founder,dummyptr)) + if (dest->GetExt(founder)) { - ServerInstance->Log(DEBUG,"Has %s",founder.c_str()); - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } - else - { - ServerInstance->Log(DEBUG,"Doesnt have %s",founder.c_str()); - } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && (!source->GetExt(protect))) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; } break; // a user is being kicked. do we chop off the end of the army boot? case AC_KICK: - ServerInstance->Log(DEBUG,"OnAccessCheck AC_KICK"); - if (dest->GetExt(founder,dummyptr)) + if (dest->GetExt(founder)) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && (!source->GetExt(protect))) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; } break; // a user is being dehalfopped. Yes, we do disallow -h of a +ha user case AC_DEHALFOP: - if (dest->GetExt(founder,dummyptr)) + if (dest->GetExt(founder)) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && (!source->GetExt(protect))) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; } break; // same with devoice. case AC_DEVOICE: - if (dest->GetExt(founder,dummyptr)) + if (dest->GetExt(founder)) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder"); + source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && (!source->GetExt(protect))) { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)"); + source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; } break; @@ -423,60 +476,16 @@ class ModuleChanProtect : public Module virtual ~ModuleChanProtect() { - DELETE(cp); - DELETE(cf); + ServerInstance->Modes->DelMode(cp); + ServerInstance->Modes->DelMode(cf); + delete cp; + delete cf; } virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - - virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) - { - // this is called when the server is linking into a net and wants to sync channel data. - // we should send our mode changes for the channel here to ensure that other servers - // know whos +q/+a on the channel. - CUList* cl = chan->GetUsers(); - string_list commands; - std::string founder = "cm_founder_"+std::string(chan->name); - std::string protect = "cm_protect_"+std::string(chan->name); - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) - { - if (i->second->GetExt(founder,dummyptr)) - { - proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(i->second->nick)); - } - if (i->second->GetExt(protect,dummyptr)) - { - proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(i->second->nick)); - } - } - } - -}; - - -class ModuleChanProtectFactory : public ModuleFactory -{ - public: - ModuleChanProtectFactory() - { - } - - ~ModuleChanProtectFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleChanProtect(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleChanProtectFactory; -} +MODULE_INIT(ModuleChanProtect)