Fix some oversights

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

diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp
index 120715429cfdcdcb28a544198701582da77060c7..1444f93ad691a3ab37174b02e10f51e0dfdcf755 100644 (file)
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -30,8 +30,9 @@ class CommandOjoin : public SplitCommand
        bool notice;
        bool op;
        ModeHandler* npmh;
-       CommandOjoin(Module* parent) :
-               SplitCommand(parent, "OJOIN", 1)
+       CommandOjoin(Module* parent, ModeHandler& mode)
+               : SplitCommand(parent, "OJOIN", 1)
+               , npmh(&mode)
        {
                flags_needed = 'o'; Penalty = 0; syntax = "<channel>";
                active = false;
@@ -64,18 +65,17 @@ class CommandOjoin : public SplitCommand
                }
                else
                {
+                       channel = ServerInstance->FindChan(parameters[0]);
+                       if (!channel)
+                               return CMD_FAILURE;
+
                        ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN in "+parameters[0]);
                        // they're already in the channel
-                       std::vector<std::string> modes;
-                       modes.push_back(parameters[0]);
-                       modes.push_back(std::string("+") + npmh->GetModeChar());
+                       Modes::ChangeList changelist;
+                       changelist.push_add(npmh, user->nick);
                        if (op)
-                       {
-                               modes[1].push_back('o');
-                               modes.push_back(user->nick);
-                       }
-                       modes.push_back(user->nick);
-                       ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
+                               changelist.push_add(ServerInstance->Modes->FindMode('o', MODETYPE_CHANNEL), user->nick);
+                       ServerInstance->Modes->Process(ServerInstance->FakeClient, channel, NULL, changelist);
                }
                return CMD_SUCCESS;
        }
@@ -87,11 +87,9 @@ class NetworkPrefix : public PrefixMode
 {
  public:
        NetworkPrefix(Module* parent, char NPrefix)
-               : PrefixMode(parent, "official-join", 'Y')
+               : PrefixMode(parent, "official-join", 'Y', NETWORK_VALUE, NPrefix)
        {
-               prefix = NPrefix;
                levelrequired = INT_MAX;
-               prefixrank = NETWORK_VALUE;
        }
 
        ModResult AccessCheck(User* source, Channel* channel, std::string &parameter, bool adding)
@@ -107,35 +105,22 @@ class NetworkPrefix : public PrefixMode
 
 class ModuleOjoin : public Module
 {
-       NetworkPrefix* np;
+       NetworkPrefix np;
        CommandOjoin mycommand;
 
  public:
 
        ModuleOjoin()
-               : np(NULL), mycommand(this)
+               : np(this, ServerInstance->Config->ConfValue("ojoin")->getString("prefix").c_str()[0])
+               , mycommand(this, np)
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               std::string npre = ServerInstance->Config->ConfValue("ojoin")->getString("prefix");
-               char NPrefix = npre.empty() ? 0 : npre[0];
-               if (NPrefix && ServerInstance->Modes->FindPrefix(NPrefix))
-                       throw ModuleException("Looks like the prefix you picked for m_ojoin is already in use. Pick another.");
-
-               /* Initialise module variables */
-               np = new NetworkPrefix(this, NPrefix);
-               mycommand.npmh = np;
-
-               ServerInstance->Modules->AddService(*np);
-       }
-
        ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
        {
                if (mycommand.active)
                {
-                       privs += np->GetModeChar();
+                       privs += np.GetModeChar();
                        if (mycommand.op)
                                privs += 'o';
                        return MOD_RES_ALLOW;
@@ -154,7 +139,7 @@ class ModuleOjoin : public Module
        ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE
        {
                // Don't do anything if they're not +Y
-               if (!memb->hasMode(np->GetModeChar()))
+               if (!memb->hasMode(np.GetModeChar()))
                        return MOD_RES_PASSTHRU;
 
                // Let them do whatever they want to themselves.
@@ -165,11 +150,6 @@ class ModuleOjoin : public Module
                return MOD_RES_DENY;
        }
 
-       ~ModuleOjoin()
-       {
-               delete np;
-       }
-
        void Prioritize()
        {
                ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_FIRST);