* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
class AuditoriumMode : public ModeHandler
{
public:
- AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { }
+ AuditoriumMode(Module* Creator) : ModeHandler(Creator, '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)
{
- 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;
- }
+ channel->SetMode('u', adding);
+ return MODEACTION_ALLOW;
}
else
{
class ModuleAuditorium : public Module
{
private:
- AuditoriumMode* aum;
+ AuditoriumMode aum;
bool ShowOps;
bool OperOverride;
- CUList nl;
- CUList except_list;
public:
- ModuleAuditorium(InspIRCd* Me)
- : Module(Me)
+ ModuleAuditorium()
+ : aum(this)
{
- aum = new AuditoriumMode(ServerInstance);
- if (!ServerInstance->Modes->AddMode(aum))
- {
- delete aum;
+ if (!ServerInstance->Modes->AddMode(&aum))
throw ModuleException("Could not add new modes!");
- }
- OnRehash(NULL, "");
+ OnRehash(NULL);
- Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnUserList, I_OnRehash };
- Me->Modules->Attach(eventlist, this, 6);
+ Implementation eventlist[] = { I_OnUserJoin, I_OnUserPart, I_OnUserKick, I_OnUserQuit, I_OnNamesListItem, I_OnRehash, I_OnHostCycle };
+ ServerInstance->Modules->Attach(eventlist, this, 7);
}
-
- virtual ~ModuleAuditorium()
- {
- ServerInstance->Modes->DelMode(aum);
- delete aum;
- }
- void Prioritize()
+ ~ModuleAuditorium()
{
- Module* namesx = ServerInstance->Modules->Find("m_namesx.so");
- ServerInstance->Modules->SetPriority(this, I_OnUserList, PRIO_BEFORE, &namesx);
+ ServerInstance->Modes->DelMode(&aum);
}
- virtual void OnRehash(User* user, const std::string ¶meter)
+ 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(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_COMMON | VF_VENDOR, API_VERSION);
}
- virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
+ void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
{
- if (Ptr->IsModeSet('u'))
+ if (!memb->chan->IsModeSet('u'))
+ return;
+
+ /* Some module hid this from being displayed, dont bother */
+ if (nick.empty())
+ return;
+
+ /* If user is oper and operoverride is on, don't touch the list */
+ if (OperOverride && issuer->HasPrivPermission("channels/auspex"))
+ return;
+
+ if (ShowOps && (issuer != memb->user) && (memb->getRank() < OP_VALUE))
{
- if (OperOverride)
- {
- if (IS_OPER(user))
- {
- /*
- * If user is oper and operoverride is on, don't touch the list
- */
- return 0;
- }
- }
-
- 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 %c %s :%s", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name, user->nick);
- user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
- return 1;
- }
+ /* Showops is set, hide all non-ops from the user, except themselves */
+ nick.clear();
+ return;
}
- return 0;
- }
-
- virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
- {
- if (channel->IsModeSet('u'))
+
+ if (!ShowOps && (issuer != memb->user))
{
- 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);
+ /* ShowOps is not set, hide everyone except the user whos requesting NAMES */
+ nick.clear();
+ return;
}
}
- void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
+ void BuildExcept(Membership* memb, CUList& excepts)
{
- if (channel->IsModeSet('u'))
+ if (!memb->chan->IsModeSet('u'))
+ return;
+ if (ShowOps && memb->getRank() >= OP_VALUE)
+ 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 (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 OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
+ {
+ 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, 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 OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts)
+ {
+ BuildExcept(memb, excepts);
+ }
+
+ ModResult OnHostCycle(User* user)
+ {
+ for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
+ if ((*f)->IsModeSet('u'))
+ return MOD_RES_DENY;
+
+ return MOD_RES_PASSTHRU;
}
void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
{
Command* parthandler = ServerInstance->Parser->GetHandler("PART");
std::vector<std::string> to_leave;
- const char* parameters[2];
if (parthandler)
{
for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++)
{
- if (f->first->IsModeSet('u'))
- to_leave.push_back(f->first->name);
+ if ((*f)->IsModeSet('u'))
+ to_leave.push_back((*f)->name);
}
/* We cant do this neatly in one loop, as we are modifying the map we are iterating */
for (std::vector<std::string>::iterator n = to_leave.begin(); n != to_leave.end(); n++)
{
- parameters[0] = n->c_str();
+ std::vector<std::string> parameters;
+ parameters.push_back(*n);
/* This triggers our OnUserPart, above, making the PART silent */
- parthandler->Handle(parameters, 1, user);
+ parthandler->Handle(parameters, user);
}
}
}
projects / user / henk / code / inspircd.git / blobdiff