In visual studio, CRT crashes when strftime() is given an invalid format specifier...

[user/henk/code/inspircd.git] / src / modules / m_namesx.cpp

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index a1ae48b7026acd7618c27b8738f5ca764b4b00ef..97a7ef79015367167f428e7fcda8401aa93d0bed 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -14,9 +14,7 @@
 #include "inspircd.h"
 #include "m_cap.h"
 
-static const char* dummy = "ON";
-
-/* $ModDesc: Provides aliases of commands. */
+/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
 
 class ModuleNamesX : public Module
 {
@@ -25,7 +23,7 @@ class ModuleNamesX : public Module
        ModuleNamesX(InspIRCd* Me)
                : Module(Me)
        {
-               Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnUserList, I_On005Numeric, I_OnEvent };
+               Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
                ServerInstance->Modules->Attach(eventlist, this, 5);
        }
 
@@ -42,7 +40,7 @@ class ModuleNamesX : public Module
 
        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)
@@ -62,99 +60,28 @@ class ModuleNamesX : public Module
                {
                        if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX")))
                        {
-                               user->Extend("NAMESX",dummy);
+                               user->Extend("NAMESX");
                                return 1;
                        }
                }
                return 0;
        }
 
-       virtual int OnUserList(User* user, Channel* Ptr, CUList* &ulist)
+       virtual void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick)
        {
-               if (user->GetExt("NAMESX"))
-               {
-                       char list[MAXBUF];
-                       size_t dlen, curlen;
-                       dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name);
-                       int numusers = 0;
-                       char* ptr = list + dlen;
+               if (!issuer->GetExt("NAMESX"))
+                       return;
 
-                       if (!ulist)
-                               ulist = Ptr->GetUsers();
-
-                       bool has_user = Ptr->HasUser(user);
-                       for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
-                       {
-                               if ((!has_user) && (i->first->IsModeSet('i')))
-                                       continue;
+               /* Some module hid this from being displayed, dont bother */
+               if (nick.empty())
+                       return;
 
-                               if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
-                                       continue;
-
-                               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->first), i->second.c_str());
-                               /* OnUserList can change this - reset it back to normal */
-                               i->second = i->first->nick;
-                               curlen += ptrlen;
-                               ptr += ptrlen;
-                               numusers++;
-                               if (curlen > (480-NICKMAX))
-                               {
-                                       /* list overflowed into multiple numerics */
-                                       user->WriteServ(std::string(list));
-                                       /* reset our lengths */
-                                       dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name);
-                                       ptr = list + dlen;
-                                       ptrlen = 0;
-                                       numusers = 0;
-                               }
-                       }
-                       /* if whats left in the list isnt empty, send it */
-                       if (numusers)
-                       {
-                               user->WriteServ(std::string(list));
-                       }
-                       user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name);
-                       return 1;
-               }
-               return 0;               
-       }
+               prefixes = channel->GetAllPrefixChars(user);
+       }
 
        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->wanted.erase(it);
-                               data->ack.push_back(*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->ack.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");
        }
 };