Replace std::deque with std::vector in spanningtree and related modules

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

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index bc04cc307d3f8e1294a1eacea2378d48478676c8..852764db14816a743f701c46825a8ca87664a3a3 100644 (file)
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,26 +12,25 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
-/* $ModDesc: Provides the ability to abbreviate commands. */
+/* $ModDesc: Provides the ability to abbreviate commands a-la BBC BASIC keywords. */
 
 class ModuleAbbreviation : public Module
 {
 
  public:
-       
+
        ModuleAbbreviation(InspIRCd* Me)
                : Module(Me)
        {
                Me->Modules->Attach(I_OnPreCommand, this);
                /* Must do this first */
-               Me->Modules->SetPriority(this, I_OnPreCommand, PRIO_FIRST);
+               Me->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST);
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 
        virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
@@ -43,7 +42,50 @@ class ModuleAbbreviation : public Module
                /* Whack the . off the end */
                command.erase(command.end() - 1);
 
-               ServerInstance->Logs->Log("m_abbreviation", DEBUG, "Abbreviated command: %s", command.c_str());
+               /* Look for any command that starts with the same characters, if it does, replace the command string with it */
+               size_t clen = command.length();
+               std::string foundcommand, matchlist;
+               bool foundmatch = false;
+               for (Commandtable::iterator n = ServerInstance->Parser->cmdlist.begin(); n != ServerInstance->Parser->cmdlist.end(); ++n)
+               {
+                       if (n->first.length() < clen)
+                               continue;
+
+                       if (command == n->first.substr(0, clen))
+                       {
+                               if (matchlist.length() > 450)
+                               {
+                                       user->WriteNumeric(420, "%s :Ambiguous abbreviation and too many possible matches.", user->nick.c_str());
+                                       return true;
+                               }
+
+                               if (!foundmatch)
+                               {
+                                       /* Found the command */
+                                       foundcommand = n->first;
+                                       foundmatch = true;
+                               }
+                               else
+                                       matchlist.append(" ").append(n->first);
+                       }
+               }
+
+               /* Ambiguous command, list the matches */
+               if (!matchlist.empty())
+               {
+                       user->WriteNumeric(420, "%s :Ambiguous abbreviation, posssible matches: %s%s", user->nick.c_str(), foundcommand.c_str(), matchlist.c_str());
+                       return true;
+               }
+
+               if (foundcommand.empty())
+               {
+                       /* No match, we have to put the . back again so that the invalid command numeric looks correct. */
+                       command += '.';
+               }
+               else
+               {
+                       command = foundcommand;
+               }
 
                return false;
        }