* ---------------------------------------------------
*/
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
/* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */
public:
AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { }
- 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)
{
{
private:
AuditoriumMode* aum;
+ bool ShowOps;
+ CUList nl;
+ CUList except_list;
public:
ModuleAuditorium(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
aum = new AuditoriumMode(ServerInstance);
- if (!ServerInstance->AddMode(aum, 'u'))
+ if (!ServerInstance->AddMode(aum))
throw ModuleException("Could not add new modes!");
+ OnRehash(NULL, "");
}
virtual ~ModuleAuditorium()
DELETE(aum);
}
+ virtual void OnRehash(User* user, const std::string ¶meter)
+ {
+ ConfigReader conf(ServerInstance);
+ ShowOps = conf.ReadFlag("auditorium", "showops", 0);
+ }
+
Priority Prioritize()
{
/* To ensure that we get priority over namesx for names list generation on +u channels */
- return (Priority)ServerInstance->PriorityBefore("m_namesx.so");
+ return (Priority)ServerInstance->Modules->PriorityBefore("m_namesx.so");
}
virtual Version GetVersion()
void Implements(char* List)
{
- List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = 1;
+ List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = List[I_OnRehash] = 1;
}
- virtual int OnUserList(userrec* user, chanrec* Ptr)
+ virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
{
if (Ptr->IsModeSet('u'))
{
- /* 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;
+ 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;
+ }
}
return 0;
}
- virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+ virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
{
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);
}
}
- void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent)
+ void OnUserPart(User* user, Channel* channel, const std::string &partmessage, bool &silent)
{
if (channel->IsModeSet('u'))
{
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());
+ }
}
}
- void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent)
+ void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
{
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", channel->name, user->nick, reason.c_str());
- user->WriteFrom(source, "KICK %s %s %s", channel->name, user->nick, reason.c_str());
+ 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());
}
}
- void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
+ void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
{
- command_t* parthandler = ServerInstance->Parser->GetHandler("PART");
+ Command* parthandler = ServerInstance->Parser->GetHandler("PART");
std::vector<std::string> to_leave;
const char* parameters[2];
if (parthandler)
}
};
-class ModuleAuditoriumFactory : public ModuleFactory
-{
- public:
- ModuleAuditoriumFactory()
- {
- }
-
- ~ModuleAuditoriumFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleAuditorium(Me);
- }
-
-};
-
-extern "C" void * init_module( void )
-{
- return new ModuleAuditoriumFactory;
-}
-
+MODULE_INIT(ModuleAuditorium)
projects / user / henk / code / inspircd.git / blobdiff