More AddModes fixes

[user/henk/code/inspircd.git] / src / modules / m_auditorium.cpp

diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp
index c49391d2f438f6d2d413d53864ebe8b86930253d..a686d74447a662dd4fbd33ed0bb3b4ad1a079c05 100644 (file)
--- a/src/modules/m_auditorium.cpp
+++ b/src/modules/m_auditorium.cpp
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#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 */
@@ -23,7 +20,7 @@ class AuditoriumMode : public ModeHandler
  public:
        AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (channel->IsModeSet('u') != adding)
                {
@@ -54,10 +51,10 @@ class ModuleAuditorium : public Module
        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, "");
        }
@@ -68,7 +65,7 @@ class ModuleAuditorium : public Module
                DELETE(aum);
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                ConfigReader conf(ServerInstance);
                ShowOps = conf.ReadFlag("auditorium", "showops", 0);
@@ -77,7 +74,7 @@ class ModuleAuditorium : public Module
        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()
@@ -90,7 +87,7 @@ class ModuleAuditorium : public Module
                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, CUList* &nameslist)
+       virtual int OnUserList(User* user, Channel* Ptr, CUList* &nameslist)
        {
                if (Ptr->IsModeSet('u'))
                {
@@ -107,14 +104,14 @@ class ModuleAuditorium : public Module
 
                                /* Show all the opped users */
                                nl = *(Ptr->GetOppedUsers());
-                               nl[user] = user;
+                               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("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;
                        }
@@ -122,7 +119,7 @@ class ModuleAuditorium : public Module
                return 0;
        }
        
-       virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+       virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
        {
                if (channel->IsModeSet('u'))
                {
@@ -134,7 +131,7 @@ class ModuleAuditorium : public Module
                }
        }
 
-       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'))
                {
@@ -151,7 +148,7 @@ class ModuleAuditorium : public Module
                }
        }
 
-       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'))
                {
@@ -165,9 +162,9 @@ class ModuleAuditorium : public Module
                }
        }
 
-       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)
@@ -188,26 +185,4 @@ class ModuleAuditorium : public Module
        }
 };
 
-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)