X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_invisible.cpp;h=12e0cfa84ffecc52e11d40b3b1548404cce6da30;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=7ccd8188b3b1a301746cc98fb7a983e018fb44eb;hpb=3d8ec5dbd9cfde34fcbc63ad7b9b1369866f0a33;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp index 7ccd8188b..12e0cfa84 100644 --- a/src/modules/m_invisible.cpp +++ b/src/modules/m_invisible.cpp @@ -1,5 +1,5 @@ /* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | + * | Inspire Internet Relay Chat Daemon * +------------------------------------+ * * InspIRCd: (C) 2002-2009 InspIRCd Development Team @@ -16,41 +16,16 @@ /* $ModDesc: Allows for opered clients to join channels without being seen, similar to unreal 3.1 +I mode */ -static ConfigReader* conf; - -class QuietOper : public VisData -{ - public: - QuietOper() - { - } - - virtual ~QuietOper() - { - } - - virtual bool VisibleTo(User* user) - { - return IS_OPER(user); - } -}; - - class InvisibleMode : public ModeHandler { - QuietOper* qo; public: - InvisibleMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'Q', 0, 0, false, MODETYPE_USER, true) + InvisibleMode(Module* Creator) : ModeHandler(Creator, "invis-oper", 'Q', PARAM_NONE, MODETYPE_USER) { - qo = new QuietOper(); + oper = true; } ~InvisibleMode() { - for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++) - if (i->second->Visibility == qo) - i->second->Visibility = NULL; - delete qo; } ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) @@ -66,9 +41,6 @@ class InvisibleMode : public ModeHandler if (m && adding) m->OnUserQuit(dest, "Connection closed", "Connection closed"); - /* Set visibility handler object */ - dest->Visibility = adding ? qo : NULL; - /* This has to come after setting/unsetting the handler */ if (m && !adding) m->OnPostConnect(dest); @@ -76,21 +48,21 @@ class InvisibleMode : public ModeHandler /* User appears to vanish or appear from nowhere */ for (UCListIter f = dest->chans.begin(); f != dest->chans.end(); f++) { - CUList *ulist = f->first->GetUsers(); + const UserMembList *ulist = (*f)->GetUsers(); char tb[MAXBUF]; - snprintf(tb,MAXBUF,":%s %s %s", dest->GetFullHost().c_str(), adding ? "PART" : "JOIN", f->first->name.c_str()); + snprintf(tb,MAXBUF,":%s %s %s", dest->GetFullHost().c_str(), adding ? "PART" : "JOIN", (*f)->name.c_str()); std::string out = tb; - std::string n = this->ServerInstance->Modes->ModeString(dest, f->first); + std::string n = ServerInstance->Modes->ModeString(dest, (*f)); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++) { /* User only appears to vanish for non-opers */ if (IS_LOCAL(i->first) && !IS_OPER(i->first)) { i->first->Write(out); if (!n.empty() && !adding) - i->first->WriteServ("MODE %s +%s", f->first->name.c_str(), n.c_str()); + i->first->WriteServ("MODE %s +%s", (*f)->name.c_str(), n.c_str()); } } } @@ -108,7 +80,7 @@ class InvisibleMode : public ModeHandler class InvisibleDeOper : public ModeWatcher { public: - InvisibleDeOper(InspIRCd* Instance) : ModeWatcher(Instance, 'o', MODETYPE_USER) + InvisibleDeOper(Module* parent) : ModeWatcher(parent, 'o', MODETYPE_USER) { } @@ -133,10 +105,8 @@ class ModuleInvisible : public Module InvisibleMode qm; InvisibleDeOper ido; public: - ModuleInvisible(InspIRCd* Me) - : Module(Me), qm(Me, this), ido(Me) + ModuleInvisible() : qm(this), ido(this) { - conf = new ConfigReader(ServerInstance); if (!ServerInstance->Modes->AddMode(&qm)) throw ModuleException("Could not add new modes!"); if (!ServerInstance->Modes->AddModeWatcher(&ido)) @@ -144,93 +114,62 @@ class ModuleInvisible : public Module /* Yeah i know people can take this out. I'm not about to obfuscate code just to be a pain in the ass. */ ServerInstance->Users->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible"); - Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserJoin, I_OnUserPart, I_OnUserQuit, I_OnRehash, I_OnHostCycle }; - ServerInstance->Modules->Attach(eventlist, this, 7); + Implementation eventlist[] = { + I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserJoin, + I_OnBuildNeighborList, I_OnSendWhoLine, I_OnNamesListItem + }; + ServerInstance->Modules->Attach(eventlist, this, 6); }; - virtual ~ModuleInvisible() + ~ModuleInvisible() { - ServerInstance->Modes->DelMode(&qm); - ServerInstance->Modes->DelModeWatcher(&ido); - delete conf; }; - virtual Version GetVersion(); - virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created); - virtual void OnRehash(User* user); - void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent); - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message); - bool OnHostCycle(User* user); - /* No privmsg response when hiding - submitted by Eric at neowin */ - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); - /* Fix by Eric @ neowin.net, thanks :) -- Brain */ - void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5); + Version GetVersion(); + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts); + void OnBuildNeighborList(User* source, UserChanList &include, std::map &exceptions); + ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); + ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); + void OnSendWhoLine(User* source, User* user, Channel* channel, std::string& line); + void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick); }; Version ModuleInvisible::GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Allows opers to join channels invisibly", VF_COMMON | VF_VENDOR); } -void ModuleInvisible::OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created) +static void BuildExcept(Membership* memb, CUList& excepts) { - if (user->IsModeSet('Q')) + const UserMembList* users = memb->chan->GetUsers(); + for(UserMembCIter i = users->begin(); i != users->end(); i++) { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */ - this->WriteCommonFrom(user, channel, "JOIN %s", channel->name.c_str()); - ServerInstance->SNO->WriteToSnoMask('a', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost().c_str(), channel->name.c_str()); + // hide from all local non-opers + if (IS_LOCAL(i->first) && !IS_OPER(i->first)) + excepts.insert(i->first); } } -void ModuleInvisible::OnRehash(User* user) +void ModuleInvisible::OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) { - delete conf; - conf = new ConfigReader(ServerInstance); -} - -void ModuleInvisible::OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) -{ - if (user->IsModeSet('Q')) + if (memb->user->IsModeSet('Q')) { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */ - this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name.c_str(), - partmessage.empty() ? "" : " :", - partmessage.empty() ? "" : partmessage.c_str()); + BuildExcept(memb, excepts); + ServerInstance->SNO->WriteToSnoMask('a', "\2NOTICE\2: Oper %s has joined %s invisibly (+Q)", + memb->user->GetFullHost().c_str(), memb->chan->name.c_str()); } } -void ModuleInvisible::OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) +void ModuleInvisible::OnBuildNeighborList(User* source, UserChanList &include, std::map &exceptions) { - if (user->IsModeSet('Q')) + if (source->IsModeSet('Q')) { - Command* parthandler = ServerInstance->Parser->GetHandler("PART"); - std::vector to_leave; - if (parthandler) - { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - to_leave.push_back(f->first->name); - /* We cant do this neatly in one loop, as we are modifying the map we are iterating */ - for (std::vector::iterator n = to_leave.begin(); n != to_leave.end(); n++) - { - std::vector parameters; - parameters.push_back(*n); - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, user); - } - } + include.clear(); } } -bool ModuleInvisible::OnHostCycle(User* user) -{ - return user->IsModeSet('Q'); -} - /* No privmsg response when hiding - submitted by Eric at neowin */ -int ModuleInvisible::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) +ModResult ModuleInvisible::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if ((target_type == TYPE_USER) && (IS_LOCAL(user))) { @@ -238,39 +177,27 @@ int ModuleInvisible::OnUserPreNotice(User* user,void* dest,int target_type, std: if(target->IsModeSet('Q') && !IS_OPER(user)) { user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), target->nick.c_str()); - return 1; + return MOD_RES_DENY; } } - return 0; + return MOD_RES_PASSTHRU; } -int ModuleInvisible::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) +ModResult ModuleInvisible::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return OnUserPreNotice(user, dest, target_type, text, status, exempt_list); } -/* Fix by Eric @ neowin.net, thanks :) -- Brain */ -void ModuleInvisible::WriteCommonFrom(User *user, Channel* channel, const char* text, ...) +void ModuleInvisible::OnSendWhoLine(User* source, User* user, Channel* channel, std::string& line) { - va_list argsPtr; - char textbuffer[MAXBUF]; - char tb[MAXBUF]; - - va_start(argsPtr, text); - vsnprintf(textbuffer, MAXBUF, text, argsPtr); - va_end(argsPtr); - snprintf(tb,MAXBUF,":%s %s",user->GetFullHost().c_str(), textbuffer); - - CUList *ulist = channel->GetUsers(); + if (user->IsModeSet('Q') && !IS_OPER(source)) + line.clear(); +} - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - /* User only appears to vanish for non-opers */ - if (IS_LOCAL(i->first) && IS_OPER(i->first)) - { - i->first->Write(std::string(tb)); - } - } +void ModuleInvisible::OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) +{ + if (memb->user->IsModeSet('Q') && !IS_OPER(issuer)) + nick.clear(); } MODULE_INIT(ModuleInvisible)