* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "m_cap.h"
-static const char* dummy = "ON";
-
-/* $ModDesc: Provides aliases of commands. */
+/* $ModDesc: Provides the UHNAMES facility. */
class ModuleUHNames : public Module
{
ModuleUHNames(InspIRCd* Me)
: Module(Me)
{
- }
-
- void Implements(char* List)
- {
- List[I_OnSyncUserMetaData] = List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1;
+ Implementation eventlist[] = { I_OnEvent, I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric };
+ ServerInstance->Modules->Attach(eventlist, this, 5);
}
virtual ~ModuleUHNames()
{
}
- void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+ void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
{
if ((displayable) && (extname == "UHNAMES"))
proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled");
virtual Version GetVersion()
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version(1,2,0,1,VF_VENDOR,API_VERSION);
}
virtual void On005Numeric(std::string &output)
output.append(" UHNAMES");
}
- Priority Prioritize()
- {
- return (Priority)ServerInstance->PriorityBefore("m_namesx.so");
- }
-
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+ virtual int OnPreCommand(const std::string &command, const std::vector<std::string> ¶meters, User *user, bool validated, const std::string &original_line)
{
irc::string c = command.c_str();
/* We don't actually create a proper command handler class for PROTOCTL,
*/
if (c == "PROTOCTL")
{
- if ((pcnt) && (!strcasecmp(parameters[0],"UHNAMES")))
+ if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"UHNAMES")))
{
- user->Extend("UHNAMES",dummy);
+ user->Extend("UHNAMES");
return 1;
}
}
return 0;
}
- /* IMPORTANT: This must be prioritized above NAMESX! */
- virtual int OnUserList(userrec* user, chanrec* Ptr, CUList* &ulist)
+ virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
{
- if (user->GetExt("UHNAMES"))
- {
- if (!ulist)
- ulist = Ptr->GetUsers();
+ if (!issuer->GetExt("UHNAMES"))
+ return;
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
- i->second = i->first->GetFullHost();
- }
- return 0;
- }
+ if (nick.empty())
+ return;
+
+ nick = user->GetFullHost();
+ }
+
+ virtual void OnEvent(Event* ev)
+ {
+ GenericCapHandler(ev, "UHNAMES", "userhost-in-names");
+ }
};
MODULE_INIT(ModuleUHNames)
-