ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- if (IS_SERVER(source) || (source && ServerInstance->ULine(source->server)))
+ if (IS_SERVER(source) || ServerInstance->ULine(source->server))
return MODEACTION_ALLOW;
else
{
bool NeedsOper() { return true; }
};
+class ModuleOperPrefixMode;
+class HideOperWatcher : public ModeWatcher
+{
+ ModuleOperPrefixMode* parentmod;
+
+ public:
+ HideOperWatcher(ModuleOperPrefixMode* parent);
+ void AfterMode(User* source, User* dest, Channel* channel, const std::string ¶meter, bool adding);
+};
+
class ModuleOperPrefixMode : public Module
{
- private:
OperPrefixMode opm;
+ HideOperWatcher hideoperwatcher;
+
public:
ModuleOperPrefixMode()
- : opm(this)
+ : opm(this), hideoperwatcher(this)
{
}
- void init()
+ void init() CXX11_OVERRIDE
{
ServerInstance->Modules->AddService(opm);
- Implementation eventlist[] = { I_OnPostJoin, I_OnOper };
- ServerInstance->Modules->Attach(eventlist, this, 2);
- }
+ Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
- void PushChanMode(Channel* channel, User* user)
- {
- char modeline[] = "+y";
- std::vector<std::string> modechange;
- modechange.push_back(channel->name);
- modechange.push_back(modeline);
- modechange.push_back(user->nick);
- ServerInstance->SendMode(modechange,ServerInstance->FakeClient);
- }
+ /* 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.
+ */
- void OnPostJoin(Membership* memb)
- {
- if (IS_OPER(memb->user) && !memb->user->IsModeSet('H'))
- PushChanMode(memb->chan, memb->user);
+ ServerInstance->Modes->AddModeWatcher(&hideoperwatcher);
}
- // XXX: is there a better way to do this?
- ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt)
+ ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
{
- /* force event propagation to its ModeHandler */
- if (!IS_SERVER(user) && chan && (mode == 'y'))
- return MOD_RES_ALLOW;
+ if ((user->IsOper()) && (user->IsModeSet('H')))
+ privs.push_back('y');
return MOD_RES_PASSTHRU;
}
- void OnOper(User *user, const std::string&)
+ void SetOperPrefix(User* user, bool add)
{
- if (user && !user->IsModeSet('H'))
+ 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++)
{
- for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++)
- {
- PushChanMode(*v, user);
- }
+ modechange[0] = (*v)->name;
+ ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient);
}
}
+ void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE
+ {
+ if (IS_LOCAL(user) && (!user->IsModeSet('H')))
+ SetOperPrefix(user, true);
+ }
+
+
~ModuleOperPrefixMode()
{
+ ServerInstance->Modes->DelModeWatcher(&hideoperwatcher);
}
- Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR);
}
+
+ void Prioritize()
+ {
+ // 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)