X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=4955b7c49e08f022b3be2aa88164b6fc95806d46;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;hp=8da062593f99ed2f2f157bdfab7866a72ee0d2d9;hpb=5abd3b1cc5fba26486d71c6a415fae797388ddf3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 8da062593..4955b7c49 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -18,9 +18,12 @@ class AuditoriumMode : public ModeHandler { public: - AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false, 0, '@') { } + AuditoriumMode(Module* Creator) : ModeHandler(Creator, "auditorium", 'u', PARAM_NONE, MODETYPE_CHANNEL) + { + levelrequired = OP_VALUE; + } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { if (channel->IsModeSet('u') != adding) { @@ -41,39 +44,38 @@ class ModuleAuditorium : public Module bool ShowOps; bool OperOverride; public: - ModuleAuditorium(InspIRCd* Me) - : Module(Me), aum(Me) + ModuleAuditorium() + : aum(this) { if (!ServerInstance->Modes->AddMode(&aum)) throw ModuleException("Could not add new modes!"); OnRehash(NULL); - Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash, I_OnHostCycle }; - Me->Modules->Attach(eventlist, this, 7); + Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnBuildNeighborList, I_OnNamesListItem, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 6); } - virtual ~ModuleAuditorium() + ~ModuleAuditorium() { - ServerInstance->Modes->DelMode(&aum); } - virtual void OnRehash(User* user) + void OnRehash(User* user) { - ConfigReader conf(ServerInstance); + ConfigReader conf; ShowOps = conf.ReadFlag("auditorium", "showops", 0); OperOverride = conf.ReadFlag("auditorium", "operoverride", 0); } - virtual Version GetVersion() + Version GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list", VF_COMMON | VF_VENDOR); } - virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) + void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) { - if (!channel->IsModeSet('u')) + if (!memb->chan->IsModeSet('u')) return; /* Some module hid this from being displayed, dont bother */ @@ -84,14 +86,14 @@ class ModuleAuditorium : public Module if (OperOverride && issuer->HasPrivPermission("channels/auspex")) return; - if (ShowOps && (issuer != user) && (channel->GetStatus(user) < STATUS_OP)) + if (ShowOps && (issuer != memb->user) && (memb->getRank() < OP_VALUE)) { /* Showops is set, hide all non-ops from the user, except themselves */ nick.clear(); return; } - if (!ShowOps && (issuer != user)) + if (!ShowOps && (issuer != memb->user)) { /* ShowOps is not set, hide everyone except the user whos requesting NAMES */ nick.clear(); @@ -99,94 +101,50 @@ class ModuleAuditorium : public Module } } - void WriteOverride(User* source, Channel* channel, const std::string &text) + void BuildExcept(Membership* memb, CUList& excepts) { - if (!OperOverride) + if (!memb->chan->IsModeSet('u')) + return; + if (ShowOps && memb->getRank() >= OP_VALUE) return; - CUList *ulist = channel->GetUsers(); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) - { - if (i->first->HasPrivPermission("channels/auspex") && source != i->first) - if (!ShowOps || (ShowOps && channel->GetStatus(i->first) < STATUS_OP)) - i->first->WriteFrom(source, "%s",text.c_str()); - } - } - - virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created) - { - if (channel->IsModeSet('u')) + 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) */ - user->WriteFrom(user, "JOIN %s", channel->name.c_str()); - if (ShowOps) - channel->WriteAllExceptSender(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', "JOIN %s", channel->name.c_str()); - WriteOverride(user, channel, "JOIN "+channel->name); + if (i->first == memb->user || !IS_LOCAL(i->first)) + continue; + if (ShowOps && i->second->getRank() >= OP_VALUE) + continue; + if (OperOverride && i->first->HasPrivPermission("channels/auspex")) + continue; + // This is a different user in the channel, local, and not op/oper + // so, hide the join from them + excepts.insert(i->first); } } - - void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent) + void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) { - if (channel->IsModeSet('u')) - { - silent = true; - /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */ - user->WriteFrom(user, "PART %s%s%s", channel->name.c_str(), - partmessage.empty() ? "" : " :", - partmessage.empty() ? "" : partmessage.c_str()); - if (ShowOps) - { - channel->WriteAllExceptSender(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', "PART %s%s%s", channel->name.c_str(), partmessage.empty() ? "" : " :", - partmessage.empty() ? "" : partmessage.c_str()); - } - WriteOverride(user, channel, "PART " + channel->name + (partmessage.empty() ? "" : (" :" + partmessage))); - } + BuildExcept(memb, excepts); } - void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) { - if (chan->IsModeSet('u')) - { - silent = true; - /* Send silenced event only to the user being kicked and the user doing the kick */ - source->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); - if (ShowOps) - chan->WriteAllExceptSender(source, false, chan->GetStatus(user) >= STATUS_OP ? 0 : '@', "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); - if ((!ShowOps) || (chan->GetStatus(user) < STATUS_OP)) /* make sure the target gets the event */ - user->WriteFrom(source, "KICK %s %s %s", chan->name.c_str(), user->nick.c_str(), reason.c_str()); - WriteOverride(source, chan, "KICK " + chan->name + " " + user->nick + " " + reason); - } + BuildExcept(memb, excepts); } - bool OnHostCycle(User* user) + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - if (f->first->IsModeSet('u')) - return true; - - return false; + BuildExcept(memb, excepts); } - void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) + void OnBuildNeighborList(User* source, UserChanList &include, std::map &exception) { - Command* parthandler = ServerInstance->Parser->GetHandler("PART"); - std::vector to_leave; - if (parthandler) + UCListIter i = include.begin(); + while (i != include.end()) { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) - { - if (f->first->IsModeSet('u')) - 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); - } + Channel* c = *i++; + if (c->IsModeSet('u')) + include.erase(c); } } };