Merge insp20

[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 ec117e095d8265886d9df9f42fcc6e7459804da7..c906322bf529967fba09f4413bc0e0fef0b8afb3 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -1,80 +1,98 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "m_cap.h"
 
-/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
+#include "inspircd.h"
+#include "modules/cap.h"
 
 class ModuleNamesX : public Module
 {
+       Cap::Capability cap;
  public:
-       GenericCap cap;
        ModuleNamesX() : cap(this, "multi-prefix")
        {
-               Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent };
-               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
-
-       ~ModuleNamesX()
-       {
-       }
-
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
        }
 
-       void On005Numeric(std::string &output)
+       void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
-               output.append(" NAMESX");
+               tokens["NAMESX"];
        }
 
-       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
        {
-               irc::string c = command.c_str();
                /* We don't actually create a proper command handler class for PROTOCTL,
                 * because other modules might want to have PROTOCTL hooks too.
                 * Therefore, we just hook its as an unvalidated command therefore we
                 * can capture it even if it doesnt exist! :-)
                 */
-               if (c == "PROTOCTL")
+               if (command == "PROTOCTL")
                {
                        if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
                        {
-                               cap.ext.set(user, 1);
+                               cap.set(user, true);
                                return MOD_RES_DENY;
                        }
                }
                return MOD_RES_PASSTHRU;
        }
 
-       void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
+       ModResult OnNamesListItem(User* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE
        {
-               if (!cap.ext.get(issuer))
+               if (cap.get(issuer))
+                       prefixes = memb->GetAllPrefixChars();
+
+               return MOD_RES_PASSTHRU;
+       }
+
+       void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE
+       {
+               if ((!memb) || (!cap.get(source)))
                        return;
 
-               /* Some module hid this from being displayed, dont bother */
-               if (nick.empty())
+               // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
+               // only ever valid after whitespace, so... find the actual delimiter first!
+               // Thanks to FxChiP for pointing this out.
+               std::string::size_type pos = line.find(" :");
+               if (pos == std::string::npos || pos == 0)
+                       return;
+               pos--;
+               // Don't do anything if the user has no prefixes
+               if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
                        return;
 
-               prefixes = memb->chan->GetAllPrefixChars(memb->user);
-       }
+               // 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
+               //                                                            pos
 
-       void OnEvent(Event& ev)
-       {
-               cap.HandleEvent(ev);
+               // Don't do anything if the user has only one prefix
+               std::string prefixes = memb->GetAllPrefixChars();
+               if (prefixes.length() <= 1)
+                       return;
+
+               line.erase(pos, 1);
+               line.insert(pos, prefixes);
        }
 };