Merge pull request #1018 from SaberUK/insp20+hidekills

[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 d4daf2b6387a8ec94d97e2901bf695cc236443cd..026d98f869032be75394fdedb528e109a1b9702f 100644 (file)
--- a/src/modules/m_ojoin.cpp
+++ b/src/modules/m_ojoin.cpp
@@ -61,7 +61,7 @@ class CommandOjoin : public Command
                // Make sure the channel name is allowable.
                if (!ServerInstance->IsChannel(parameters[0].c_str(), ServerInstance->Config->Limits.ChanMax))
                {
-                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name or name too long");
+                       user->WriteServ("NOTICE "+user->nick+" :*** Invalid characters in channel name or name too long");
                        return CMD_FAILURE;
                }
 
@@ -71,24 +71,25 @@ class CommandOjoin : public Command
 
                if (channel)
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used OJOIN to join "+channel->name);
+                       ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN to join "+channel->name);
 
                        if (notice)
                        {
-                               channel = ServerInstance->FindChan(parameters[0]);
-                               channel->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s joined on official network business.",
+                               channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s joined on official network business.",
                                        parameters[0].c_str(), user->nick.c_str());
-                               ServerInstance->PI->SendChannelNotice(channel, 0, std::string(user->nick) + " joined on official network business.");
+                               ServerInstance->PI->SendChannelNotice(channel, 0, user->nick + " joined on official network business.");
                        }
                }
                else
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used OJOIN in "+parameters[0]);
+                       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("+Y");
+                       modes.push_back(op ? "+Yo" : "+Y");
                        modes.push_back(user->nick);
+                       if (op)
+                               modes.push_back(user->nick);
                        ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient);
                }
                return CMD_SUCCESS;
@@ -188,7 +189,7 @@ class ModuleOjoin : public Module
                ServerInstance->Modules->AddService(mycommand);
 
                Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserPreKick, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)