ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-12 20:19:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for CAP in uhnames, it has the token 'userhost-in-names'. Comments welcome.

Browse Source 
Add a function to m_cap.h, "GenericCapHandler" which allows a one-line definition of a CAP token that just adds a metadata tag, as used by NAMESX and UHNAMES. Saves code duplication.


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9145 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
brain 2008-03-21 16:23:55 +00:00
parent f6b8a12a80
commit 6f566e0a32
3 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/modules/m_cap.h
View File

@ -6,7 +6,7 @@
* See: http://www.inspircd.org/wiki/index.php/Credits * See: http://www.inspircd.org/wiki/index.php/Credits
* *
* This program is free but copyrighted software; see * 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; 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 #endif

39
src/modules/m_namesx.cpp
View File

@ -14,8 +14,6 @@
#include "inspircd.h" #include "inspircd.h"
#include "m_cap.h" #include "m_cap.h"
static const char* dummy = "ON";
/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */ /* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
class ModuleNamesX : public Module class ModuleNamesX : public Module
@ -62,7 +60,7 @@ class ModuleNamesX : public Module
{ {
if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX"))) if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX")))
{ {
user->Extend("NAMESX",dummy); user->Extend("NAMESX");
return 1; return 1;
} }
} }
@ -83,40 +81,7 @@ class ModuleNamesX : public Module
virtual void OnEvent(Event *ev) virtual void OnEvent(Event *ev)
{ {
if (ev->GetEventID() == "cap_req") GenericCapHandler(ev, "NAMESX", "multi-prefix");
{
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");
}
} }
}; };

12
src/modules/m_uhnames.cpp
View File

@ -12,8 +12,7 @@
*/ */
#include "inspircd.h" #include "inspircd.h"
#include "m_cap.h"
static const char* dummy = "ON";
/* $ModDesc: Provides the UHNAMES facility. */ /* $ModDesc: Provides the UHNAMES facility. */
@ -25,7 +24,7 @@ class ModuleUHNames : public Module
ModuleUHNames(InspIRCd* Me) ModuleUHNames(InspIRCd* Me)
: Module(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); ServerInstance->Modules->Attach(eventlist, this, 4);
} }
@ -61,7 +60,7 @@ class ModuleUHNames : public Module
{ {
if ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES"))) if ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES")))
{ {
user->Extend("UHNAMES",dummy); user->Extend("UHNAMES");
return 1; return 1;
} }
} }
@ -78,6 +77,11 @@ class ModuleUHNames : public Module
nick = user->GetFullHost(); nick = user->GetFullHost();
} }
virtual void OnEvent(Event* ev)
{
GenericCapHandler(ev, "UHNAMES", "userhost-in-names");
}
}; };
MODULE_INIT(ModuleUHNames) MODULE_INIT(ModuleUHNames)