#define NETWORK_VALUE 9000000
-char NPrefix;
-bool notice;
-bool op;
-
/** Handle /OJOIN
*/
class CommandOjoin : public SplitCommand
{
public:
bool active;
+ bool notice;
+ bool op;
+ ModeHandler* npmh;
CommandOjoin(Module* parent) :
SplitCommand(parent, "OJOIN", 1)
{
// they're already in the channel
std::vector<std::string> modes;
modes.push_back(parameters[0]);
- modes.push_back(op ? "+Yo" : "+Y");
- modes.push_back(user->nick);
+ modes.push_back(std::string("+") + npmh->GetModeChar());
if (op)
+ {
+ modes[1].push_back('o');
modes.push_back(user->nick);
+ }
+ modes.push_back(user->nick);
ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
}
return CMD_SUCCESS;
/** channel mode +Y
*/
-class NetworkPrefix : public ModeHandler
+class NetworkPrefix : public PrefixMode
{
public:
- NetworkPrefix(Module* parent) : ModeHandler(parent, "official-join", 'Y', PARAM_ALWAYS, MODETYPE_CHANNEL)
+ NetworkPrefix(Module* parent, char NPrefix)
+ : PrefixMode(parent, "official-join", 'Y')
{
- list = true;
prefix = NPrefix;
levelrequired = INT_MAX;
- m_paramtype = TR_NICK;
prefixrank = NETWORK_VALUE;
}
return MOD_RES_PASSTHRU;
}
-
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
- {
- return MODEACTION_ALLOW;
- }
-
};
class ModuleOjoin : public Module
void init() CXX11_OVERRIDE
{
- /* Load config stuff */
- OnRehash(NULL);
+ 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);
+ np = new NetworkPrefix(this, NPrefix);
+ mycommand.npmh = np;
ServerInstance->Modules->AddService(*np);
- ServerInstance->Modules->AddService(mycommand);
-
- Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserPreKick, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
{
if (mycommand.active)
{
- privs += 'Y';
- if (op)
+ privs += np->GetModeChar();
+ if (mycommand.op)
privs += 'o';
return MOD_RES_ALLOW;
}
return MOD_RES_PASSTHRU;
}
- void OnRehash(User* user) CXX11_OVERRIDE
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
ConfigTag* Conf = ServerInstance->Config->ConfValue("ojoin");
-
- if (!np)
- {
- // This is done on module load only
- std::string npre = Conf->getString("prefix");
- NPrefix = npre.empty() ? 0 : npre[0];
-
- if (NPrefix && ServerInstance->Modes->FindPrefix(NPrefix))
- throw ModuleException("Looks like the +Y prefix you picked for m_ojoin is already in use. Pick another.");
- }
-
- notice = Conf->getBool("notice", true);
- op = Conf->getBool("op", true);
+ mycommand.notice = Conf->getBool("notice", true);
+ mycommand.op = Conf->getBool("op", true);
}
ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason) CXX11_OVERRIDE
{
// Don't do anything if they're not +Y
- if (!memb->hasMode('Y'))
+ if (!memb->hasMode(np->GetModeChar()))
return MOD_RES_PASSTHRU;
// Let them do whatever they want to themselves.
if (source == memb->user)
return MOD_RES_PASSTHRU;
- source->WriteNumeric(484, source->nick+" "+memb->chan->name+" :Can't kick "+memb->user->nick+" as they're on official network business.");
+ source->WriteNumeric(ERR_RESTRICTED, memb->chan->name+" :Can't kick "+memb->user->nick+" as they're on official network business.");
return MOD_RES_DENY;
}