/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2009 Taros <taros34@hotmail.com>
+ * Copyright (C) 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2010 Craig Edwards <brain@inspircd.org>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
bool notice;
bool op;
ModeHandler* npmh;
+ ChanModeReference opmode;
CommandOjoin(Module* parent, ModeHandler& mode)
: SplitCommand(parent, "OJOIN", 1)
, npmh(&mode)
+ , opmode(parent, "op")
{
- flags_needed = 'o'; syntax = "<channel>";
+ flags_needed = 'o';
+ syntax = "<channel>";
active = false;
}
- CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user) CXX11_OVERRIDE
+ CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
{
// Make sure the channel name is allowable.
if (!ServerInstance->IsChannel(parameters[0]))
ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN to join "+channel->name);
if (notice)
- {
- const std::string msg = user->nick + " joined on official network business.";
- channel->WriteNotice(msg);
- ServerInstance->PI->SendChannelNotice(channel, 0, msg);
- }
+ channel->WriteRemoteNotice(user->nick + " joined on official network business.");
}
else
{
// they're already in the channel
Modes::ChangeList changelist;
changelist.push_add(npmh, user->nick);
- if (op)
- changelist.push_add(ServerInstance->Modes->FindMode('o', MODETYPE_CHANNEL), user->nick);
+ if (op && opmode)
+ changelist.push_add(*opmode, user->nick);
ServerInstance->Modes->Process(ServerInstance->FakeClient, channel, NULL, changelist);
}
return CMD_SUCCESS;
if (mycommand.active)
{
privs += np.GetModeChar();
- if (mycommand.op)
- privs += 'o';
+ if (mycommand.op && mycommand.opmode)
+ privs += mycommand.opmode->IsPrefixMode()->GetPrefix();
return MOD_RES_ALLOW;
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Network Business Join", VF_VENDOR);
+ return Version("Adds the /OJOIN command which allows server operators to join a channel and receive the server operator-only Y (official-join) channel prefix mode.", VF_VENDOR);
}
};