-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
*
- * 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/>.
*/
+
/*
* Originally by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru
*/
#define OPERPREFIX_VALUE 1000000
-std::set<std::string>* SetupExt(User* user)
-{
- std::set<std::string>* ext;
- if (!user->GetExt("m_operprefix",ext))
- {
- ext=new std::set<std::string>;
- ext->clear();
- user->Extend("m_operprefix",ext);
- }
- return ext;
-}
-
-
-void DelPrefixChan(User* user, Channel* channel)
-{
- std::set<std::string>* chans = SetupExt(user);
- chans->erase(channel->name);
-}
-
-
-void AddPrefixChan(User* user, Channel* channel)
-{
- std::set<std::string>* chans = SetupExt(user);
- chans->insert(channel->name);
-}
-
-
class OperPrefixMode : public ModeHandler
{
public:
- OperPrefixMode(InspIRCd* Instance, Module* Creator, char pfx) : ModeHandler(Instance, Creator, 'y', 1, 1, true, MODETYPE_CHANNEL, false, pfx, pfx, TR_NICK) { }
-
- unsigned int GetPrefixRank()
+ OperPrefixMode(Module* Creator) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL)
{
- return OPERPREFIX_VALUE;
+ std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!");
+ list = true;
+ prefix = pfx.empty() ? '!' : pfx[0];
+ levelrequired = OPERPREFIX_VALUE;
+ m_paramtype = TR_NICK;
+ prefixrank = OPERPREFIX_VALUE;
}
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- if (IS_FAKE(source) || (source && ServerInstance->ULine(source->server)))
+ if (IS_SERVER(source) || ServerInstance->ULine(source->server))
return MODEACTION_ALLOW;
else
{
- if (source && channel)
+ if (channel)
source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only servers are permitted to change channel mode '%c'", source->nick.c_str(), channel->name.c_str(), 'y');
return MODEACTION_DENY;
}
}
- 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::set<std::string>* ext;
- if (x->GetExt("m_operprefix",ext))
- {
- if (ext->find(channel->name)!=ext->end())
- {
- return std::make_pair(true, x->nick);
- }
- else
- return std::make_pair(false, parameter);
- }
- else
- {
- return std::make_pair(false, parameter);
- }
- }
- }
- return std::make_pair(false, parameter);
- }
-
bool NeedsOper() { return true; }
};
-class ModuleOperPrefixMode : public Module
+class ModuleOperPrefixMode;
+class HideOperWatcher : public ModeWatcher
{
- private:
- OperPrefixMode* opm;
- public:
- ModuleOperPrefixMode(InspIRCd* Me) : Module(Me)
- {
- ConfigReader Conf(ServerInstance);
- std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false);
+ ModuleOperPrefixMode* parentmod;
- opm = new OperPrefixMode(ServerInstance, this, pfx[0]);
- if ((!ServerInstance->Modes->AddMode(opm)))
- throw ModuleException("Could not add a new mode!");
+ public:
+ HideOperWatcher(ModuleOperPrefixMode* parent);
+ void AfterMode(User* source, User* dest, Channel* channel, const std::string ¶meter, bool adding);
+};
- Implementation eventlist[] = { I_OnPostJoin, I_OnCleanup, I_OnUserQuit, I_OnUserKick, I_OnUserPart, I_OnOper };
- ServerInstance->Modules->Attach(eventlist, this, 6);
- }
+class ModuleOperPrefixMode : public Module
+{
+ OperPrefixMode opm;
+ HideOperWatcher hideoperwatcher;
- void PushChanMode(Channel* channel, User* user, bool negate = false)
+ public:
+ ModuleOperPrefixMode()
+ : opm(this), hideoperwatcher(this)
{
- if (negate)
- DelPrefixChan(user, channel);
- else
- AddPrefixChan(user, channel);
- char modeline[] = "+y";
- if (negate)
- modeline[0] = '-';
- std::vector<std::string> modechange;
- modechange.push_back(channel->name);
- modechange.push_back(modeline);
- modechange.push_back(user->nick);
- ServerInstance->SendMode(modechange,this->ServerInstance->FakeClient);
}
- virtual void OnPostJoin(User *user, Channel *channel)
+ void init() CXX11_OVERRIDE
{
- if (user && IS_OPER(user))
- {
- if (user->IsModeSet('H'))
- {
- /* we respect your wish to be invisible */
- return;
- }
- PushChanMode(channel, user);
- }
- }
+ ServerInstance->Modules->AddService(opm);
- // XXX: is there a better way to do this?
- virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt)
- {
- /* force event propagation to its ModeHandler */
- if (!IS_FAKE(user) && chan && (mode == 'y'))
- return MOD_RES_ALLOW;
- return MOD_RES_PASSTHRU;
- }
+ Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
- virtual void OnOper(User *user, const std::string&)
- {
- if (user && !user->IsModeSet('H'))
- {
- for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
- {
- PushChanMode(v->first, user);
- }
- }
- }
+ /* To give clients a chance to learn about the new prefix we don't give +y to opers
+ * right now. That means if the module was loaded after opers have joined channels
+ * they need to rejoin them in order to get the oper prefix.
+ */
- virtual ~ModuleOperPrefixMode()
- {
- ServerInstance->Modes->DelMode(opm);
- delete opm;
+ ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
}
- void CleanUser(User* user, bool quitting)
+ ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
{
-
- std::set<std::string>* ext;
- if (user->GetExt("m_operprefix",ext))
- {
- // Don't want to announce -mode when they're quitting anyway..
- if (!quitting)
- {
- for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
- {
- ModePair ms = opm->ModeSet(NULL, NULL , v->first, user->nick);
- if (ms.first)
- {
- PushChanMode(v->first, user, true);
- }
- }
- }
- ext->clear();
- delete ext;
- user->Shrink("m_operprefix");
- }
+ if ((user->IsOper()) && (user->IsModeSet('H')))
+ privs.push_back('y');
+ return MOD_RES_PASSTHRU;
}
- virtual void OnCleanup(int target_type, void* item)
+ void SetOperPrefix(User* user, bool add)
{
- if (target_type == TYPE_USER)
+ std::vector<std::string> modechange;
+ modechange.push_back("");
+ modechange.push_back(add ? "+y" : "-y");
+ modechange.push_back(user->nick);
+ for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
{
- User* user = (User*)item;
- CleanUser(user, false);
+ modechange[0] = (*v)->name;
+ ServerInstance->Modes->Process(modechange, ServerInstance->FakeClient);
}
}
- virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
+ void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE
{
- CleanUser(user,true);
+ if (IS_LOCAL(user) && (!user->IsModeSet('H')))
+ SetOperPrefix(user, true);
}
- virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent)
+
+ ~ModuleOperPrefixMode()
{
- DelPrefixChan(user, chan);
+ ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
}
- virtual void OnUserPart(User* user, Channel* channel, std::string &partreason, bool &silent)
+ Version GetVersion() CXX11_OVERRIDE
{
- DelPrefixChan(user, channel);
+ return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
}
- virtual Version GetVersion()
+ void Prioritize()
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ // m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case
+ Module* opermodes = ServerInstance->Modules->Find("m_opermodes.so");
+ ServerInstance->Modules->SetPriority(this, I_OnPostOper, PRIORITY_AFTER, opermodes);
}
};
+HideOperWatcher::HideOperWatcher(ModuleOperPrefixMode* parent)
+ : ModeWatcher(parent, "hideoper", MODETYPE_USER)
+ , parentmod(parent)
+{
+}
+
+void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding)
+{
+ if (IS_LOCAL(dest))
+ parentmod->SetOperPrefix(dest, !adding);
+}
+
MODULE_INIT(ModuleOperPrefixMode)
projects / user / henk / code / inspircd.git / blobdiff