X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_randquote.cpp;h=0148e48d6c0e780c9c1d0bf76e46f964bba5faae;hb=HEAD;hp=c3a9c514f3e21411164097979527cfc291d0973c;hpb=7d93921aabd9c608821baec8a871aff844dfae49;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index c3a9c514f..0148e48d6 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -1,108 +1,58 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2013, 2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2003, 2006-2008, 2010 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"
-
-static FileReader *quotes = NULL;
-
-std::string q_file;
-std::string prefix;
-std::string suffix;
-
-/* $ModDesc: Provides random Quotes on Connect. */
 
-/** Handle /RANDQUOTE
- */
-class CommandRandquote : public Command
-{
- public:
-	CommandRandquote(Module* Creator) : Command(Creator,"RANDQUOTE", 0)
-	{
-	}
-
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
-	{
-		std::string str;
-		int fsize;
-
-		if (q_file.empty() || quotes->Exists())
-		{
-			fsize = quotes->FileSize();
-			str = quotes->GetLine(rand() % fsize);
-			user->WriteServ("NOTICE %s :%s%s%s",user->nick.c_str(),prefix.c_str(),str.c_str(),suffix.c_str());
-		}
-		else
-		{
-			user->WriteServ("NOTICE %s :Your administrator specified an invalid quotes file, please bug them about this.", user->nick.c_str());
-			return CMD_FAILURE;
-		}
-
-		return CMD_SUCCESS;
-	}
-};
+#include "inspircd.h"
 
 class ModuleRandQuote : public Module
 {
  private:
-	CommandRandquote cmd;
-	ConfigReader *conf;
- public:
-	ModuleRandQuote(InspIRCd* Me)
-		: Module(Me), cmd(this)
-	{
-
-		conf = new ConfigReader(ServerInstance);
-		// Sort the Randomizer thingie..
-		srand(ServerInstance->Time());
+	std::string prefix;
+	std::string suffix;
+	std::vector<std::string> quotes;
 
-		q_file = conf->ReadValue("randquote","file",0);
-		prefix = conf->ReadValue("randquote","prefix",0);
-		suffix = conf->ReadValue("randquote","suffix",0);
-
-		if (q_file.empty())
-		{
-			throw ModuleException("m_randquote: Quotefile not specified - Please check your config.");
-		}
-
-		quotes = new FileReader(ServerInstance, q_file);
-		if(!quotes->Exists())
-		{
-			throw ModuleException("m_randquote: QuoteFile not Found!! Please check your config - module will not function.");
-		}
-		else
-		{
-			/* Hidden Command -- Mode clients assume /quote sends raw data to an IRCd >:D */
-			ServerInstance->AddCommand(&cmd);
-		}
-		Implementation eventlist[] = { I_OnUserConnect };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
-	}
-
-
-	virtual ~ModuleRandQuote()
+ public:
+	void init() CXX11_OVERRIDE
 	{
-		delete conf;
-		delete quotes;
+		ConfigTag* conf = ServerInstance->Config->ConfValue("randquote");
+		prefix = conf->getString("prefix");
+		suffix = conf->getString("suffix");
+		FileReader reader(conf->getString("file", "quotes", 1));
+		quotes = reader.GetVector();
 	}
 
-	virtual Version GetVersion()
+	void OnUserConnect(LocalUser* user) CXX11_OVERRIDE
 	{
-		return Version("Provides random Quotes on Connect.",VF_VENDOR,API_VERSION);
+		if (!quotes.empty())
+		{
+			unsigned long random = ServerInstance->GenRandomInt(quotes.size());
+			user->WriteNotice(prefix + quotes[random] + suffix);
+		}
 	}
 
-	virtual void OnUserConnect(User* user)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		cmd.Handle(std::vector<std::string>(), user);
+		return Version("Allows random quotes to be sent to users when they connect to the server.", VF_VENDOR);
 	}
 };