Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

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

diff --git a/src/modules/m_uninvite.cpp b/src/modules/m_uninvite.cpp
index d5b1b587d91cb9ec823ad2febfbbabe0fd49c605..044907b69310838cd9c1f6d01b3364c991268e64 100644 (file)
--- a/src/modules/m_uninvite.cpp
+++ b/src/modules/m_uninvite.cpp
@@ -22,15 +22,17 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
-#include "message.h"
 
-static Server *Srv;
+#include "configreader.h"
+#include "inspircd.h"
+
+
+
         
 class cmd_uninvite : public command_t
 {
  public:
-       cmd_uninvite () : command_t("UNINVITE", 0, 2)
+ cmd_uninvite (InspIRCd* Instance) : command_t(Instance,"UNINVITE", 0, 2)
        {
                this->source = "m_uninvite.so";
                syntax = "<nick> <channel>";
@@ -38,18 +40,18 @@ class cmd_uninvite : public command_t
 
        void Handle (const char** parameters, int pcnt, userrec *user)
        {
-               userrec* u = Find(parameters[0]);
-               chanrec* c = FindChan(parameters[1]);
+               userrec* u = ServerInstance->FindNick(parameters[0]);
+               chanrec* c = ServerInstance->FindChan(parameters[1]);
                         
                if ((!c) || (!u))
                {       
                        if (!c)
                        {
-                               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]);
+                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
                        }
                        else
                        {
-                               WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                        }
                                
                        return; 
@@ -57,9 +59,9 @@ class cmd_uninvite : public command_t
 
                if (c->modes[CM_INVITEONLY])
                {
-                       if (cstatus(user,c) < STATUS_HOP)
+                       if (c->GetStatus(user) < STATUS_HOP)
                        {
-                               WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
+                               user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
                                return;
                        }
                }
@@ -68,19 +70,19 @@ class cmd_uninvite : public command_t
 
                if (!u->IsInvited(xname))
                {
-                       WriteServ(user->fd,"491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
+                       user->WriteServ("491 %s %s %s :Is not invited to channel %s",user->nick,u->nick,c->name,c->name);
                        return;
                }
                if (!c->HasUser(user))
                {
-                       WriteServ(user->fd,"492 %s %s :You're not on that channel!",user->nick, c->name);
+                       user->WriteServ("492 %s %s :You're not on that channel!",user->nick, c->name);
                        return;
                }
 
                u->RemoveInvite(xname);
-               WriteServ(user->fd,"494 %s %s %s :Uninvited",user->nick,c->name,u->nick);
-               WriteServ(u->fd,"493 %s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
-               WriteChannel(c,user,"NOTICE %s :*** %s uninvited %s.",c->name,user->nick,u->nick);
+               user->WriteServ("494 %s %s %s :Uninvited",user->nick,c->name,u->nick);
+               u->WriteServ("493 %s :You were uninvited from %s by %s",u->nick,c->name,user->nick);
+               c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s uninvited %s.", c->name, user->nick, u->nick);
        }
 };
 
@@ -90,11 +92,11 @@ class ModuleUninvite : public Module
 
  public:
 
-       ModuleUninvite(Server* Me) : Module::Module(Me)
+       ModuleUninvite(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_uninvite();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_uninvite(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleUninvite()
@@ -120,7 +122,7 @@ class ModuleUninviteFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleUninvite(Me);
        }