From 386f0dafd55897723356c75299cd02ed0b882f5b Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Mon, 3 Jul 2023 17:26:40 +0100
Subject: Replace FileReader with something more sensible.

---
 src/modules/m_randquote.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/modules/m_randquote.cpp')

diff --git a/src/modules/m_randquote.cpp b/src/modules/m_randquote.cpp
index ceb2b1982..beecd2680 100644
--- a/src/modules/m_randquote.cpp
+++ b/src/modules/m_randquote.cpp
@@ -22,7 +22,6 @@
 
 
 #include "inspircd.h"
-#include "fileutils.h"
 
 class ModuleRandQuote final
 	: public Module
@@ -43,8 +42,17 @@ public:
 		const auto& conf = ServerInstance->Config->ConfValue("randquote");
 		prefix = conf->getString("prefix");
 		suffix = conf->getString("suffix");
-		FileReader reader(conf->getString("file", "quotes", 1));
-		quotes = reader.GetVector();
+
+		const std::string filestr = conf->getString("file", "quotes", 1);
+		auto file = ServerInstance->Config->ReadFile(filestr);
+		if (!file)
+			throw ModuleException(this, "Unable to read quotes from " + filestr + ": " + file.error);
+
+		std::vector<std::string> newquotes;
+		irc::sepstream linestream(file.contents, '\n');
+		for (std::string line; linestream.GetToken(line); )
+			newquotes.push_back(line);
+		std::swap(quotes, newquotes);
 	}
 
 	void OnUserConnect(LocalUser* user) override
-- 
cgit v1.3.1-10-gc9f91