@@ -37,7+38,7 @@ class CommandSajoin : public Command
CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
User* dest = ServerInstance->FindNick(parameters[0]);
CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
User* dest = ServerInstance->FindNick(parameters[0]);
- if (dest)
+ if ((dest) && (dest->registered == REG_ALL))
{
if (ServerInstance->ULine(dest->server))
{
{
if (ServerInstance->ULine(dest->server))
{
@@ -47,7+48,7 @@ class CommandSajoin : public Command
if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax))
{
/* we didn't need to check this for each character ;) */
if (IS_LOCAL(user) && !ServerInstance->IsChannel(parameters[1].c_str(), ServerInstance->Config->Limits.ChanMax))
{
/* we didn't need to check this for each character ;) */
- 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;
}
return CMD_FAILURE;
}
@@ -64,30+65,30 @@ class CommandSajoin : public Command
{
if (n->HasUser(dest))
{
{
if (n->HasUser(dest))
{
- ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" used SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+ ServerInstance->SNO->WriteToSnoMask('a', user->nick+" used SAJOIN to make "+dest->nick+" join "+parameters[1]);
return CMD_SUCCESS;
}
else
{
return CMD_SUCCESS;
}
else
{
- user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
+ user->WriteServ("NOTICE "+user->nick+" :*** Could not join "+dest->nick+" to "+parameters[1]+" (User is probably banned, or blocking modes)");
return CMD_FAILURE;
}
}
else
{
return CMD_FAILURE;
}
}
else
{
- user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+std::string(dest->nick)+" to "+parameters[1]);
+ user->WriteServ("NOTICE "+user->nick+" :*** Could not join "+dest->nick+" to "+parameters[1]);
return CMD_FAILURE;
}
}
else
{
return CMD_FAILURE;
}
}
else
{
- ServerInstance->SNO->WriteToSnoMask('a', std::string(user->nick)+" sent remote SAJOIN to make "+std::string(dest->nick)+" join "+parameters[1]);
+ ServerInstance->SNO->WriteToSnoMask('a', user->nick+" sent remote SAJOIN to make "+dest->nick+" join "+parameters[1]);
return CMD_SUCCESS;
}
}
else
{
return CMD_SUCCESS;
}
}
else
{
- user->WriteServ("NOTICE "+std::string(user->nick)+" :*** No such nickname "+parameters[0]);
+ user->WriteServ("NOTICE "+user->nick+" :*** No such nickname "+parameters[0]);
return CMD_FAILURE;
}
}
return CMD_FAILURE;
}
}
@@ -108,7+109,11 @@ class ModuleSajoin : public Module
ModuleSajoin()
: cmd(this)
{
ModuleSajoin()
: cmd(this)
{
- ServerInstance->AddCommand(&cmd);
+ }
+
+ void init()
+ {
+ ServerInstance->Modules->AddService(cmd);
}
virtual ~ModuleSajoin()
}
virtual ~ModuleSajoin()
@@ -117,7+122,7 @@ class ModuleSajoin : public Module
virtual Version GetVersion()
{
virtual Version GetVersion()
{
- return Version("Provides support for unreal-style SAJOIN command", VF_OPTCOMMON | VF_VENDOR);
+ return Version("Provides command SAJOIN to allow opers to force-join users to channels", VF_OPTCOMMON | VF_VENDOR);