* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
#include "inspircd.h"
/* $ModDesc: Provides channel modes +a and +q */
-/* $ModDep: ../../include/u_listmode.h */
#define PROTECT_VALUE 40000
#define FOUNDER_VALUE 50000
{
}
- 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 = MyInstance->FindNick(parameter);
+ User* x = MyInstance->FindNick(parameter);
if (x)
{
if (!channel->HasUser(x))
return std::make_pair(false, parameter);
}
- void RemoveMode(chanrec* channel, char mc)
+ void RemoveMode(Channel* channel, char mc)
{
unload_kludge = true;
CUList* cl = channel->GetUsers();
unload_kludge = false;
}
- void DisplayList(userrec* user, chanrec* channel)
+ void DisplayList(User* user, Channel* channel)
{
CUList* cl = channel->GetUsers();
std::string item = extend+std::string(channel->name);
user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str());
}
- userrec* FindAndVerify(std::string ¶meter, chanrec* channel)
+ User* FindAndVerify(std::string ¶meter, Channel* channel)
{
- userrec* theuser = MyInstance->FindNick(parameter);
+ User* theuser = MyInstance->FindNick(parameter);
if ((!theuser) || (!channel->HasUser(theuser)))
{
parameter.clear();
return theuser;
}
- bool CanRemoveOthers(userrec* u1, userrec* u2, chanrec* c)
+ bool CanRemoveOthers(User* u1, User* u2, Channel* c)
{
std::string item = extend+std::string(c->name);
return (u1->GetExt(item, dummyptr) && u2->GetExt(item, dummyptr));
}
- ModeAction HandleChange(userrec* source, userrec* theuser, bool adding, chanrec* channel, std::string ¶meter)
+ ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter)
{
std::string item = extend+std::string(channel->name);
{
char* dummyptr;
public:
- ChanFounder(InspIRCd* Instance, bool using_prefixes, bool &depriv_self, bool &depriv_others)
- : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '~' : 0),
+ 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(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
+ ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter)
{
return FounderProtectBase::ModeSet(source, dest, channel, parameter);
}
- void RemoveMode(chanrec* channel)
+ void RemoveMode(Channel* channel)
{
FounderProtectBase::RemoveMode(channel, this->GetModeChar());
}
- void RemoveMode(userrec* user)
+ void RemoveMode(User* user)
{
}
- ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
- userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+ User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
if (!theuser)
{
else
{
// whoops, someones being naughty!
- source->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name);
+ source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q",source->nick, channel->name);
parameter.clear();
return MODEACTION_DENY;
}
}
- void DisplayList(userrec* user, chanrec* channel)
+ void DisplayList(User* user, Channel* channel)
{
FounderProtectBase::DisplayList(user,channel);
}
{
char* dummyptr;
public:
- ChanProtect(InspIRCd* Instance, bool using_prefixes, bool &depriv_self, bool &depriv_others)
- : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '&' : 0),
+ 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(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter)
+ ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter)
{
return FounderProtectBase::ModeSet(source, dest, channel, parameter);
}
- void RemoveMode(chanrec* channel)
+ void RemoveMode(Channel* channel)
{
FounderProtectBase::RemoveMode(channel, this->GetModeChar());
}
- void RemoveMode(userrec* user)
+ void RemoveMode(User* user)
{
}
- ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
- userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+ User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
if (!theuser)
return MODEACTION_DENY;
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)
{
FounderProtectBase::DisplayList(user, channel);
}
{
bool FirstInGetsFounder;
- bool QAPrefixes;
+ char QPrefix;
+ char APrefix;
bool DeprivSelf;
bool DeprivOthers;
bool booting;
public:
ModuleChanProtect(InspIRCd* Me)
- : Module(Me), FirstInGetsFounder(false), QAPrefixes(false), DeprivSelf(false), DeprivOthers(false), booting(true)
+ : Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true)
{
/* Load config stuff */
OnRehash(NULL,"");
/* Initialise module variables */
- cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
- cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
+ cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers);
+ cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers);
- if (!ServerInstance->AddMode(cp, 'a') || !ServerInstance->AddMode(cf, 'q'))
+ 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_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnPostJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1;
+ Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnRehash, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck };
+ ServerInstance->Modules->Attach(eventlist, this, 6);
}
- virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
+ 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, bool &silent)
+ 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(userrec* user, const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
/* Create a configreader class and read our flag,
* in old versions this was heap-allocated and the
*/
ConfigReader Conf(ServerInstance);
- bool old_qa = QAPrefixes;
+ char old_q = QPrefix;
+ char old_a = APrefix;
+
+ 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];
- FirstInGetsFounder = Conf.ReadFlag("options","noservices",0);
- QAPrefixes = Conf.ReadFlag("options","qaprefixes",0);
DeprivSelf = Conf.ReadFlag("options","deprotectself",0);
DeprivOthers = Conf.ReadFlag("options","deprotectothers",0);
+ ServerInstance->Logs->Log("chanprotect", DEBUG, "qprefix is %c and aprefix is %c", QPrefix, APrefix);
+
/* Did the user change the QA prefixes on the fly?
* If so, remove all instances of the mode, and reinit
* the module with prefixes enabled.
*/
- if ((old_qa != QAPrefixes) && (!booting))
+ if ((old_q != QPrefix) && (!booting))
{
- ServerInstance->Modes->DelMode(cp);
ServerInstance->Modes->DelMode(cf);
- DELETE(cp);
- DELETE(cf);
- cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
- cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
+ delete cf;
+ cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers);
/* These wont fail, we already owned the mode characters before */
- ServerInstance->AddMode(cp, 'a');
- ServerInstance->AddMode(cf, 'q');
- ServerInstance->WriteOpers("*** WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
+ ServerInstance->Modes->AddMode(cf);
+ ServerInstance->SNO->WriteToSnoMask('A', "WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
+ }
+
+ if ((old_a != APrefix) && (!booting))
+ {
+ ServerInstance->Modes->DelMode(cp);
+ delete cp;
+ cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers);
+ ServerInstance->Modes->AddMode(cp);
+ ServerInstance->SNO->WriteToSnoMask('A', "WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
}
}
- virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs)
+ virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs)
{
// 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 && !chan)
- privs = "~@";
+ privs = QPrefix + "@";
return 0;
}
- virtual void OnPostJoin(userrec *user, chanrec *channel)
+ 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
user->WriteServ("MODE %s +q %s", channel->name, user->nick);
}
- virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type)
+ 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
case AC_DEOP:
if (dest->GetExt(founder,dummyptr))
{
- 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;
}
if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr)))
{
- 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;
case AC_KICK:
if (dest->GetExt(founder,dummyptr))
{
- 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)))
{
- 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;
case AC_DEHALFOP:
if (dest->GetExt(founder,dummyptr))
{
- 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)))
{
- 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;
case AC_DEVOICE:
if (dest->GetExt(founder,dummyptr))
{
- 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)))
{
- 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;
{
ServerInstance->Modes->DelMode(cp);
ServerInstance->Modes->DelMode(cf);
- DELETE(cp);
- DELETE(cf);
+ delete cp;
+ delete cf;
}
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
- }
-
- virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
- {
- /* NOTE: If +qa prefix is on, this is propogated by the channel join,
- * so we dont need to propogate it manually
- */
- if (!QAPrefixes)
- {
- // 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);
- irc::modestacker modestack(true);
- std::deque<std::string> stackresult;
- for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
- {
- if (i->first->GetExt(founder,dummyptr))
- {
- modestack.Push('q',i->first->nick);
- }
- if (i->first->GetExt(protect,dummyptr))
- {
- modestack.Push('a',i->first->nick);
- }
- }
- while (modestack.GetStackedLine(stackresult))
- {
- irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1);
- std::string line = mode_join.GetJoined();
- proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan, line);
- }
- }
+ return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
-
};
MODULE_INIT(ModuleChanProtect)
projects / user / henk / code / inspircd.git / blobdiff