-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
*
- * ---------------------------------------------------
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
/*
* Written for InspIRCd-1.2 by Taros on the Tel'Laerad M&D Team
* <http://tellaerad.net>
{
public:
bool active;
- CommandOjoin (InspIRCd* Instance, Module* parent) : Command(Instance,parent,"OJOIN", "o", 1, false, 0)
+ CommandOjoin(Module* parent) : Command(parent,"OJOIN", 1)
{
- syntax = "<channel>";
+ flags_needed = 'o'; Penalty = 0; syntax = "<channel>";
active = false;
TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
}
// 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;
}
active = true;
- Channel* channel = Channel::JoinUser(ServerInstance, user, parameters[0].c_str(), false, "", false);
+ Channel* channel = Channel::JoinUser(user, parameters[0].c_str(), false, "", false);
active = false;
if (channel)
{
- ServerInstance->SNO->WriteGlobalSno('a', std::string(user->nick)+" used OJOIN to join "+channel->name);
-
- if (!NPrefix)
- {
- std::vector<std::string> modes;
- modes.push_back(parameters[0]);
- modes.push_back("+Y");
- modes.push_back(user->nick);
- ServerInstance->SendMode(modes, ServerInstance->FakeClient);
- ServerInstance->PI->SendMode(channel->name, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
- }
+ ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used OJOIN to join "+channel->name);
if (notice)
{
- channel = ServerInstance->FindChan(parameters[0]);
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.");
}
-
- return CMD_SUCCESS;
}
else
{
- user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not join "+parameters[0]);
- 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(op ? "+Yo" : "+Y");
+ modes.push_back(user->nick);
+ if (op)
+ modes.push_back(user->nick);
+ ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient);
}
+ return CMD_SUCCESS;
}
};
-/** Abstraction of NetworkPrefixBase for channel mode +Y
+/** channel mode +Y
*/
class NetworkPrefix : public ModeHandler
{
public:
- NetworkPrefix(InspIRCd* Instance, Module* parent)
- : ModeHandler(Instance, parent, 'Y', 1, 1, true, MODETYPE_CHANNEL, false, NPrefix, 0, TR_NICK)
-// NetworkPrefixBase(Instance,"cm_network_","official user", 388, 389) { }
-// NetworkPrefixBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e) :
-// extend(ext), type(mtype), list(l), end(e)
+ NetworkPrefix(Module* parent) : ModeHandler(parent, "official-join", 'Y', PARAM_ALWAYS, MODETYPE_CHANNEL)
{
- }
-
- ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter)
- {
- User* x = ServerInstance->FindNick(parameter);
- if (x)
- {
- if (!channel->HasUser(x))
- {
- return std::make_pair(false, parameter);
- }
- else
- {
- std::string item = "cm_network_"+std::string(channel->name);
- if (x->GetExt(item))
- {
- return std::make_pair(true, x->nick);
- }
- else
- {
- return std::make_pair(false, parameter);
- }
- }
- }
- return std::make_pair(false, parameter);
+ list = true;
+ prefix = NPrefix;
+ levelrequired = INT_MAX;
+ m_paramtype = TR_NICK;
}
void RemoveMode(Channel* channel, irc::modestacker* stack)
{
- CUList* cl = channel->GetUsers();
- std::string item = "cm_network_" + std::string(channel->name);
+ const UserMembList* cl = channel->GetUsers();
std::vector<std::string> mode_junk;
mode_junk.push_back(channel->name);
- irc::modestacker modestack(ServerInstance, false);
+ irc::modestacker modestack(false);
std::deque<std::string> stackresult;
- for (CUList::iterator i = cl->begin(); i != cl->end(); i++)
+ for (UserMembCIter i = cl->begin(); i != cl->end(); i++)
{
- if (i->first->GetExt(item))
+ if (i->second->hasMode('Y'))
{
if (stack)
stack->Push(this->GetModeChar(), i->first->nick);
}
}
- User* FindAndVerify(std::string ¶meter, Channel* channel)
+ unsigned int GetPrefixRank()
{
- User* theuser = ServerInstance->FindNick(parameter);
- if ((!theuser) || (!channel->HasUser(theuser)))
- {
- parameter.clear();
- return NULL;
- }
- return theuser;
+ return NETWORK_VALUE;
}
- ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter)
+ void RemoveMode(User* user, irc::modestacker* stack)
{
- std::string item = "cm_network_" + std::string(channel->name);
-
- if (adding)
- {
- if (!theuser->GetExt(item))
- {
- theuser->Extend(item);
- parameter = theuser->nick;
- return MODEACTION_ALLOW;
- }
- }
- else
- {
- if (theuser->GetExt(item))
- {
- theuser->Shrink(item);
- parameter = theuser->nick;
- return MODEACTION_ALLOW;
- }
- }
- return MODEACTION_DENY;
}
- unsigned int GetPrefixRank()
+ ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding)
{
- return NETWORK_VALUE;
- }
+ User* theuser = ServerInstance->FindNick(parameter);
+ // remove own privs?
+ if (source == theuser && !adding)
+ return MOD_RES_ALLOW;
- void RemoveMode(User* user, irc::modestacker* stack)
- {
+ return MOD_RES_PASSTHRU;
}
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- User* theuser = FindAndVerify(parameter, channel);
-
- if (!theuser)
- return MODEACTION_DENY;
-
- // source is a server, or ulined, we'll let them +-Y the user.
- if (source == ServerInstance->FakeClient ||
- ((source == theuser) && (!adding)) ||
- (ServerInstance->ULine(source->nick.c_str())) ||
- (ServerInstance->ULine(source->server)) ||
- (!*source->server) ||
- (!IS_LOCAL(source))
- )
- {
- return HandleChange(source, theuser, adding, channel, parameter);
- }
- else
- {
- // bzzzt, wrong answer!
- source->WriteNumeric(482, "%s %s :Only servers may change this mode.", source->nick.c_str(), channel->name.c_str());
- return MODEACTION_DENY;
- }
+ return MODEACTION_ALLOW;
}
};
public:
- ModuleOjoin(InspIRCd* Me)
- : Module(Me), np(NULL), mycommand(Me, this)
+ ModuleOjoin()
+ : np(NULL), mycommand(this)
+ {
+ }
+
+ void init()
{
/* Load config stuff */
OnRehash(NULL);
/* Initialise module variables */
- np = new NetworkPrefix(ServerInstance, this);
+ np = new NetworkPrefix(this);
- if (!ServerInstance->Modes->AddMode(np))
- {
- delete np;
- throw ModuleException("Could not add new mode!");
- }
+ ServerInstance->Modules->AddService(*np);
+ ServerInstance->Modules->AddService(mycommand);
- ServerInstance->AddCommand(&mycommand);
-
- Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserKick, I_OnUserPart, I_OnAccessCheck, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 5);
+ Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserPreKick, I_OnRehash };
+ 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)
{
if (mycommand.active)
{
- if (NPrefix)
- privs += NPrefix;
- if (op && privs.find('@') == std::string::npos)
- privs += '@';
+ privs += 'Y';
+ if (op)
+ privs += 'o';
return MOD_RES_ALLOW;
}
return MOD_RES_PASSTHRU;
}
- void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
- {
- user->Shrink("cm_network_"+std::string(chan->name));
- }
-
- void OnUserPart(User* user, Channel* channel, std::string &partreason, bool &silent)
- {
- user->Shrink("cm_network_"+std::string(channel->name));
- }
-
void OnRehash(User* user)
{
- ConfigReader Conf(ServerInstance);
+ ConfigTag* Conf = ServerInstance->Config->ConfValue("ojoin");
if (!np)
{
// This is done on module load only
- std::string npre = Conf.ReadValue("ojoin", "prefix", 0);
+ 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.ReadFlag("ojoin", "notice", "yes", 0);
- op = Conf.ReadFlag("ojoin", "op", "yes", 0);
+ notice = Conf->getBool("notice", true);
+ op = Conf->getBool("op", true);
}
- ModResult OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
+ ModResult OnUserPreKick(User* source, Membership* memb, const std::string &reason)
{
- // Here's where we preform access checks, and disallow any kicking/deopping
- // of +Y users.
-
- // If there's no dest, it's not for us.
- if (!dest || !channel)
- return MOD_RES_PASSTHRU;
-
- // If a ulined nickname, or a server is setting the mode, let it
- // do whatever it wants.
- if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
- return MOD_RES_ALLOW;
-
- std::string network("cm_network_"+channel->name);
-
// Don't do anything if they're not +Y
- if (!dest->GetExt(network))
+ if (!memb->hasMode('Y'))
return MOD_RES_PASSTHRU;
// Let them do whatever they want to themselves.
- if (source == dest)
+ if (source == memb->user)
return MOD_RES_PASSTHRU;
- switch (access_type)
- {
- // Disallow deopping of +Y users.
- case AC_DEOP:
- source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't deop "+dest->nick+" as they're on official network business.");
- return MOD_RES_DENY;
- break;
-
- // Kicking people who are here on network business is a no no.
- case AC_KICK:
- source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't kick "+dest->nick+" as they're on official network business.");
- return MOD_RES_DENY;
- break;
-
- // Yes, they're immune to dehalfopping too.
- case AC_DEHALFOP:
- source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't de-halfop "+dest->nick+" as they're on official network business.");
- return MOD_RES_DENY;
- break;
-
- // same with devoice.
- case AC_DEVOICE:
- source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't devoice "+dest->nick+" as they're on official network business.");
- return MOD_RES_DENY;
- break;
- }
-
- // Some other access check that doesn't fall into the above. Let it through.
- 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.");
+ return MOD_RES_DENY;
}
~ModuleOjoin()
{
- ServerInstance->Modes->DelMode(np);
delete np;
}
Version GetVersion()
{
- return Version("Network Buisness Join", VF_COMMON | VF_VENDOR);
+ return Version("Network Business Join", VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff