X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_abbreviation.cpp;h=e07548c09983a8d1ca1d458a5b954d4819596971;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=f94f8a5cc7133e02d9c97390437e3de61b09dbb3;hpb=58857b594c596bc831fb100971c5d09eea3494c8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp
index f94f8a5cc..e07548c09 100644
--- a/src/modules/m_abbreviation.cpp
+++ b/src/modules/m_abbreviation.cpp
@@ -1,65 +1,92 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <brain@inspircd.org>
  *
- * 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"
 
-/* $ModDesc: Provides the ability to abbreviate commands a-la BBC BASIC keywords. */
+enum
+{
+	// InspIRCd-specific.
+	ERR_AMBIGUOUSCOMMAND = 420
+};
 
 class ModuleAbbreviation : public Module
 {
-
  public:
-	
-	ModuleAbbreviation(InspIRCd* Me)
-		: Module(Me)
+	void Prioritize() CXX11_OVERRIDE
 	{
-		Me->Modules->Attach(I_OnPreCommand, this);
-		/* Must do this first */
-		Me->Modules->SetPriority(this, I_OnPreCommand, PRIO_FIRST);
+		ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("Allows commands to be abbreviated by appending a full stop.", VF_VENDOR);
 	}
 
-	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
 	{
 		/* Command is already validated, has a length of 0, or last character is not a . */
 		if (validated || command.empty() || *command.rbegin() != '.')
-			return 0;
-
-		/* Whack the . off the end */
-		command.erase(command.end() - 1);
+			return MOD_RES_PASSTHRU;
 
 		/* Look for any command that starts with the same characters, if it does, replace the command string with it */
-		size_t clen = command.length();
-		for (Commandtable::iterator n = ServerInstance->Parser->cmdlist.begin(); n != ServerInstance->Parser->cmdlist.end(); ++n)
+		size_t clen = command.length() - 1;
+		std::string foundcommand, matchlist;
+		bool foundmatch = false;
+		const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
+		for (CommandParser::CommandMap::const_iterator n = commands.begin(); n != commands.end(); ++n)
 		{
-			if (n->first.length() < clen)
-				continue;
-
-			if (command == n->first.substr(0, clen))
+			if (!command.compare(0, clen, n->first, 0, clen))
 			{
-				/* Found the command */
-				command = n->first;
-				return false;
+				if (matchlist.length() > 450)
+				{
+					user->WriteNumeric(ERR_AMBIGUOUSCOMMAND, "Ambiguous abbreviation and too many possible matches.");
+					return MOD_RES_DENY;
+				}
+
+				if (!foundmatch)
+				{
+					/* Found the command */
+					foundcommand = n->first;
+					foundmatch = true;
+				}
+				else
+					matchlist.append(" ").append(n->first);
 			}
 		}
 
-		/* No match, we have to put the . back again so that the invalid command numeric looks correct. */
-		command += '.';
-		return false;
+		/* Ambiguous command, list the matches */
+		if (!matchlist.empty())
+		{
+			user->WriteNumeric(ERR_AMBIGUOUSCOMMAND, InspIRCd::Format("Ambiguous abbreviation, possible matches: %s%s", foundcommand.c_str(), matchlist.c_str()));
+			return MOD_RES_DENY;
+		}
+
+		if (!foundcommand.empty())
+		{
+			command = foundcommand;
+		}
+
+		return MOD_RES_PASSTHRU;
 	}
 };