diff options
| -rw-r--r-- | src/modules/m_cap.h | 40 | ||||
| -rw-r--r-- | src/modules/m_namesx.cpp | 39 | ||||
| -rw-r--r-- | src/modules/m_uhnames.cpp | 12 |
3 files changed, 49 insertions, 42 deletions
diff --git a/src/modules/m_cap.h b/src/modules/m_cap.h index 9f17bd3d0..5c91abc32 100644 --- a/src/modules/m_cap.h +++ b/src/modules/m_cap.h @@ -6,7 +6,7 @@ * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ @@ -27,4 +27,42 @@ class CapData Module* creator; }; +void GenericCapHandler(Event* ev, const std::string &extname, const std::string &cap) +{ + if (ev->GetEventID() == "cap_req") + { + CapData *data = (CapData *) ev->GetData(); + + std::vector<std::string>::iterator it; + if ((it = std::find(data->wanted.begin(), data->wanted.end(), cap)) != data->wanted.end()) + { + // we can handle this, so ACK it, and remove it from the wanted list + data->ack.push_back(*it); + data->wanted.erase(it); + data->user->Extend(extname); + } + } + + if (ev->GetEventID() == "cap_ls") + { + CapData *data = (CapData *) ev->GetData(); + data->wanted.push_back(cap); + } + + if (ev->GetEventID() == "cap_list") + { + CapData *data = (CapData *) ev->GetData(); + + if (data->user->GetExt(extname)) + data->wanted.push_back(cap); + } + + if (ev->GetEventID() == "cap_clear") + { + CapData *data = (CapData *) ev->GetData(); + data->ack.push_back("-" + cap); + data->user->Shrink(extname); + } +} + #endif diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index d4e5def63..5fed7f76e 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -14,8 +14,6 @@ #include "inspircd.h" #include "m_cap.h" -static const char* dummy = "ON"; - /* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */ class ModuleNamesX : public Module @@ -62,7 +60,7 @@ class ModuleNamesX : public Module { if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX"))) { - user->Extend("NAMESX",dummy); + user->Extend("NAMESX"); return 1; } } @@ -83,40 +81,7 @@ class ModuleNamesX : public Module virtual void OnEvent(Event *ev) { - if (ev->GetEventID() == "cap_req") - { - CapData *data = (CapData *) ev->GetData(); - - std::vector<std::string>::iterator it; - if ((it = std::find(data->wanted.begin(), data->wanted.end(), "multi-prefix")) != data->wanted.end()) - { - // we can handle this, so ACK it, and remove it from the wanted list - data->ack.push_back(*it); - data->wanted.erase(it); - data->user->Extend("NAMESX",dummy); - } - } - - if (ev->GetEventID() == "cap_ls") - { - CapData *data = (CapData *) ev->GetData(); - data->wanted.push_back("multi-prefix"); - } - - if (ev->GetEventID() == "cap_list") - { - CapData *data = (CapData *) ev->GetData(); - - if (data->user->GetExt("NAMESX")) - data->wanted.push_back("multi-prefix"); - } - - if (ev->GetEventID() == "cap_clear") - { - CapData *data = (CapData *) ev->GetData(); - data->ack.push_back("-multi-prefix"); - data->user->Shrink("NAMESX"); - } + GenericCapHandler(ev, "NAMESX", "multi-prefix"); } }; diff --git a/src/modules/m_uhnames.cpp b/src/modules/m_uhnames.cpp index b56ed5229..7ce81194e 100644 --- a/src/modules/m_uhnames.cpp +++ b/src/modules/m_uhnames.cpp @@ -12,8 +12,7 @@ */ #include "inspircd.h" - -static const char* dummy = "ON"; +#include "m_cap.h" /* $ModDesc: Provides the UHNAMES facility. */ @@ -25,7 +24,7 @@ class ModuleUHNames : public Module ModuleUHNames(InspIRCd* Me) : Module(Me) { - Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric }; + Implementation eventlist[] = { I_OnEvent, I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric }; ServerInstance->Modules->Attach(eventlist, this, 4); } @@ -61,7 +60,7 @@ class ModuleUHNames : public Module { if ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES"))) { - user->Extend("UHNAMES",dummy); + user->Extend("UHNAMES"); return 1; } } @@ -78,6 +77,11 @@ class ModuleUHNames : public Module nick = user->GetFullHost(); } + + virtual void OnEvent(Event* ev) + { + GenericCapHandler(ev, "UHNAMES", "userhost-in-names"); + } }; MODULE_INIT(ModuleUHNames) |