X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=2a8edb9d49f1a464eb26fe597817073b44b1ba18;hb=9f69e159adcc0892f0bdef16ac4617630737b156;hp=6d709e431f90710882f9cc8a6b7a7b9bae884b59;hpb=f2acdbc3820f0f4f5ef76a0a64e73d2a320df91f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 6d709e431..2a8edb9d4 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -1,191 +1,194 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" /* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */ class AuditoriumMode : public ModeHandler { public: - AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { } + AuditoriumMode(Module* Creator) : ModeHandler(Creator, "auditorium", 'u', PARAM_NONE, MODETYPE_CHANNEL) + { + levelrequired = OP_VALUE; + } - 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) { - if (channel->IsModeSet('u') != adding) - { - if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP)) - { - source->WriteServ("482 %s %s :Only channel operators may %sset channel mode +u", source->nick, channel->name, adding ? "" : "un"); - return MODEACTION_DENY; - } - else - { - channel->SetMode('u', adding); - return MODEACTION_ALLOW; - } - } - else - { + if (channel->IsModeSet(this) == adding) return MODEACTION_DENY; - } + channel->SetMode(this, adding); + return MODEACTION_ALLOW; } }; class ModuleAuditorium : public Module { private: - AuditoriumMode* aum; - bool ShowOps; - CUList nl; - CUList except_list; + AuditoriumMode aum; + bool OpsVisible; + bool OpsCanSee; + bool OperCanSee; public: - ModuleAuditorium(InspIRCd* Me) - : Module(Me) + ModuleAuditorium() : aum(this) { - aum = new AuditoriumMode(ServerInstance); - if (!ServerInstance->AddMode(aum, 'u')) - throw ModuleException("Could not add new modes!"); - OnRehash(NULL, ""); } - - virtual ~ModuleAuditorium() + + void init() { - ServerInstance->Modes->DelMode(aum); - DELETE(aum); + ServerInstance->Modules->AddService(aum); + + OnRehash(NULL); + + Implementation eventlist[] = { + I_OnUserJoin, I_OnUserPart, I_OnUserKick, + I_OnBuildNeighborList, I_OnNamesListItem, I_OnSendWhoLine, + I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + ~ModuleAuditorium() { - ConfigReader conf(ServerInstance); - ShowOps = conf.ReadFlag("auditorium", "showops", 0); } - Priority Prioritize() + void OnRehash(User* user) { - /* To ensure that we get priority over namesx for names list generation on +u channels */ - return (Priority)ServerInstance->PriorityBefore("m_namesx.so"); + ConfigTag* tag = ServerInstance->Config->ConfValue("auditorium"); + OpsVisible = tag->getBool("opvisible"); + OpsCanSee = tag->getBool("opcansee"); + OperCanSee = tag->getBool("opercansee", true); } - virtual Version GetVersion() + Version GetVersion() { - return Version(1, 1, 0, 0, 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_VENDOR); } - void Implements(char* List) + /* Can they be seen by everyone? */ + bool IsVisible(Membership* memb) { - List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = List[I_OnRehash] = 1; + if (!memb->chan->IsModeSet(&aum)) + return true; + + ModResult res = ServerInstance->OnCheckExemption(memb->user, memb->chan, "auditorium-vis"); + return res.check(OpsVisible && memb->getRank() >= OP_VALUE); } - virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &nameslist) + /* Can they see this specific membership? */ + bool CanSee(User* issuer, Membership* memb) { - if (Ptr->IsModeSet('u')) - { - if (ShowOps) - { - /* Leave the names list alone, theyre an op - * doing /names on the channel after joining it - */ - if (Ptr->GetStatus(user) >= STATUS_OP) - { - nameslist = Ptr->GetUsers(); - return 0; - } - - /* Show all the opped users */ - nl = *(Ptr->GetOppedUsers()); - nl[user] = user->nick; - nameslist = &nl; - return 0; - } - else - { - /* HELLOOO, IS ANYBODY THERE? -- nope, just us. */ - user->WriteServ("353 %s = %s :%s", user->nick, Ptr->name, user->nick); - user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name); - return 1; - } - } - return 0; + // If user is oper and operoverride is on, don't touch the list + if (OperCanSee && issuer->HasPrivPermission("channels/auspex")) + return true; + + // You can always see yourself + if (issuer == memb->user) + return true; + + // Can you see the list by permission? + ModResult res = ServerInstance->OnCheckExemption(issuer,memb->chan,"auditorium-see"); + if (res.check(OpsCanSee && memb->chan->GetPrefixValue(issuer) >= OP_VALUE)) + return true; + + return false; } - - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) + + void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) { - if (channel->IsModeSet('u')) - { - 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); - if (ShowOps) - channel->WriteAllExcept(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', except_list, "JOIN %s", channel->name); - } + // Some module already hid this from being displayed, don't bother + if (nick.empty()) + return; + + if (IsVisible(memb)) + return; + + if (CanSee(issuer, memb)) + return; + + nick.clear(); } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) + /** Build CUList for showing this join/part/kick */ + void BuildExcept(Membership* memb, CUList& excepts) { - if (channel->IsModeSet('u')) + if (IsVisible(memb)) + return; + + 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 leaving (but only them of course) */ - user->WriteFrom(user, "PART %s%s%s", channel->name, - partmessage.empty() ? "" : " :", - partmessage.empty() ? "" : partmessage.c_str()); - if (ShowOps) - { - channel->WriteAllExcept(user, false, channel->GetStatus(user) >= STATUS_OP ? 0 : '@', except_list, "PART %s%s%s", channel->name, partmessage.empty() ? "" : " :", - partmessage.empty() ? "" : partmessage.c_str()); - } + if (IS_LOCAL(i->first) && !CanSee(i->first, memb)) + excepts.insert(i->first); } } - void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) + void OnUserJoin(Membership* memb, bool sync, bool created, 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, user->nick, reason.c_str()); - if (ShowOps) - chan->WriteAllExcept(source, false, chan->GetStatus(source) >= STATUS_OP ? 0 : '@', except_list, "KICK %s %s %s", chan->name, user->nick, reason.c_str()); - else - user->WriteFrom(source, "KICK %s %s %s", chan->name, user->nick, reason.c_str()); - } + BuildExcept(memb, excepts); } - void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) { - command_t* parthandler = ServerInstance->Parser->GetHandler("PART"); - std::vector to_leave; - const char* parameters[2]; - if (parthandler) + BuildExcept(memb, excepts); + } + + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) + { + BuildExcept(memb, excepts); + } + + void OnBuildNeighborList(User* source, UserChanList &include, std::map &exception) + { + UCListIter i = include.begin(); + while (i != include.end()) { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) + Channel* c = *i++; + Membership* memb = c->GetUser(source); + if (!memb || IsVisible(memb)) + continue; + // this channel should not be considered when listing my neighbors + include.erase(c); + // however, that might hide me from ops that can see me... + const UserMembList* users = c->GetUsers(); + for(UserMembCIter j = users->begin(); j != users->end(); j++) { - 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++) - { - parameters[0] = n->c_str(); - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, 1, user); + if (IS_LOCAL(j->first) && CanSee(j->first, memb)) + exception[j->first] = true; } } } + + void OnSendWhoLine(User* source, const std::vector& params, User* user, std::string& line) + { + Channel* channel = ServerInstance->FindChan(params[0]); + if (!channel) + return; + Membership* memb = channel->GetUser(user); + if ((!memb) || (IsVisible(memb))) + return; + if (CanSee(source, memb)) + return; + line.clear(); + } }; MODULE_INIT(ModuleAuditorium)