*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
/* $ModDesc: Provides channel modes +a and +q */
/* $ModDep: ../../include/u_listmode.h */
{
}
- 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();
std::string item = extend + std::string(channel->name);
- const char* mode_junk[MAXMODES+1];
- userrec* n = new userrec(MyInstance);
- n->SetFd(FD_MAGIC_NUMBER);
+ const char* mode_junk[MAXMODES+2];
mode_junk[0] = channel->name;
irc::modestacker modestack(false);
std::deque<std::string> stackresult;
+
for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
{
if (i->first->GetExt(item, dummyptr))
{
mode_junk[j+1] = stackresult[j].c_str();
}
- MyInstance->SendMode(mode_junk, stackresult.size() + 1, n);
+ MyInstance->SendMode(mode_junk, stackresult.size() + 1, MyInstance->FakeClient);
}
- delete n;
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);
- for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
+ for (CUList::reverse_iterator i = cl->rbegin(); i != cl->rend(); ++i)
{
if (i->first->GetExt(item, dummyptr))
{
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 = "";
+ parameter.clear();
return NULL;
}
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);
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)
{
- userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+ User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
if (!theuser)
{
{
// whoops, someones being naughty!
source->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name);
- parameter = "";
+ parameter.clear();
return MODEACTION_DENY;
}
}
- void DisplayList(userrec* user, chanrec* channel)
+ void DisplayList(User* user, Channel* channel)
{
FounderProtectBase::DisplayList(user,channel);
}
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)
{
- userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
+ User* theuser = FounderProtectBase::FindAndVerify(parameter, channel);
if (!theuser)
return MODEACTION_DENY;
}
}
- virtual void DisplayList(userrec* user, chanrec* channel)
+ virtual void DisplayList(User* user, Channel* channel)
{
FounderProtectBase::DisplayList(user, channel);
}
cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
- if (!ServerInstance->AddMode(cp, 'a') || !ServerInstance->AddMode(cf, 'q'))
+ if (!ServerInstance->AddMode(cp) || !ServerInstance->AddMode(cf))
throw ModuleException("Could not add new modes!");
}
void Implements(char* List)
{
- List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1;
+ List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnPostJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1;
}
- 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
cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers);
/* These wont fail, we already owned the mode characters before */
- ServerInstance->AddMode(cp, 'a');
- ServerInstance->AddMode(cf, 'q');
+ ServerInstance->AddMode(cp);
+ ServerInstance->AddMode(cf);
ServerInstance->WriteOpers("*** WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change.");
}
}
- virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+ 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)
- {
- 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);
- user->Extend("cm_founder_"+std::string(channel->name),fakevalue);
- }
- }
+
+ if (FirstInGetsFounder && !chan)
+ privs = "~@";
+
+ 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
return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
}
- virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+ virtual void OnSyncChannel(Channel* 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
+ /* NOTE: If +qa prefix is on, this is propagated by the channel join,
+ * so we dont need to propagate it manually
*/
if (!QAPrefixes)
{
};
-
-class ModuleChanProtectFactory : public ModuleFactory
-{
- public:
- ModuleChanProtectFactory()
- {
- }
-
- ~ModuleChanProtectFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleChanProtect(Me);
- }
-
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
- return new ModuleChanProtectFactory;
-}
+MODULE_INIT(ModuleChanProtect)
projects / user / henk / code / inspircd.git / blobdiff