Adjust reading memoserv core config opts

5 files changed, 6 insertions, 6 deletions

diff --git a/modules/hostserv/request.cpp b/modules/hostserv/request.cpp
index 2e9ccd41b..3cc2b1aa9 100644
--- a/modules/hostserv/request.cpp
+++ b/modules/hostserv/request.cpp
@@ -204,7 +204,7 @@ class CommandHSRequest : public Command
 			return;
 		}
 
-		time_t send_delay = Config->GetModule("memoserv")->Get<time_t>("senddelay");
+		time_t send_delay = Config->GetModule("memoserv/main")->Get<time_t>("senddelay");
 		if (Config->GetModule(this->GetOwner())->Get<bool>("memooper") && send_delay > 0 && u && u->lastmemosend + send_delay > Anope::CurTime)
 		{
 			source.Reply(_("Please wait %d seconds before requesting a new vHost."), send_delay);
diff --git a/modules/memoserv/main/memoserv.cpp b/modules/memoserv/main/memoserv.cpp
index a8e9b4e81..364a22534 100644
--- a/modules/memoserv/main/memoserv.cpp
+++ b/modules/memoserv/main/memoserv.cpp
@@ -98,7 +98,7 @@ class MemoServCore : public Module, public MemoServ::MemoServService
 		User *sender = User::Find(source, true);
 		if (sender != NULL && !sender->HasPriv("memoserv/no-limit") && !force)
 		{
-			time_t send_delay = Config->GetModule("memoserv")->Get<time_t>("senddelay");
+			time_t send_delay = Config->GetModule("memoserv/main")->Get<time_t>("senddelay");
 			if (send_delay > 0 && sender->lastmemosend + send_delay > Anope::CurTime)
 				return MEMO_TOO_FAST;
 			else if (!mi->GetMemoMax())
diff --git a/modules/memoserv/rsend.cpp b/modules/memoserv/rsend.cpp
index 2656ffd3a..1c8cbea55 100644
--- a/modules/memoserv/rsend.cpp
+++ b/modules/memoserv/rsend.cpp
@@ -61,7 +61,7 @@ class CommandMSRSend : public Command
 			if (result == MemoServ::MemoServService::MEMO_INVALID_TARGET)
 				source.Reply(_("\002{0}\002 isn't registered."), nick);
 			else if (result == MemoServ::MemoServService::MEMO_TOO_FAST)
-				source.Reply(_("Please wait \002{0}\002 seconds before using the \002{1}\002 command again."), Config->GetModule("memoserv")->Get<time_t>("senddelay"), source.command);
+				source.Reply(_("Please wait \002{0}\002 seconds before using the \002{1}\002 command again."), Config->GetModule("memoserv/main")->Get<time_t>("senddelay"), source.command);
 			else if (result == MemoServ::MemoServService::MEMO_TARGET_FULL)
 				source.Reply(_("Sorry, \002{0}\002 currently has too many memos and cannot receive more."), nick);
 			else
diff --git a/modules/memoserv/send.cpp b/modules/memoserv/send.cpp
index f06e62bab..98567c3e2 100644
--- a/modules/memoserv/send.cpp
+++ b/modules/memoserv/send.cpp
@@ -58,7 +58,7 @@ class CommandMSSend : public Command
 		else if (result == MemoServ::MemoServService::MEMO_INVALID_TARGET)
 			source.Reply(_("\002{0}\002 is not a registered unforbidden nick or channel."), nick);
 		else if (result == MemoServ::MemoServService::MEMO_TOO_FAST)
-			source.Reply(_("Please wait \002{0}\002 seconds before using the \002{1}\002 command again."), Config->GetModule("memoserv")->Get<time_t>("senddelay"), source.command);
+			source.Reply(_("Please wait \002{0}\002 seconds before using the \002{1}\002 command again."), Config->GetModule("memoserv/main")->Get<time_t>("senddelay"), source.command);
 		else if (result == MemoServ::MemoServService::MEMO_TARGET_FULL)
 			source.Reply(_("Sorry, \002{0}\002 currently has too many memos and cannot receive more."), nick);
 	}
diff --git a/modules/memoserv/set.cpp b/modules/memoserv/set.cpp
index 72194d518..acb575084 100644
--- a/modules/memoserv/set.cpp
+++ b/modules/memoserv/set.cpp
@@ -167,7 +167,7 @@ class CommandMSSet : public Command
 				source.Reply(_("You are not permitted to change your memo limit."));
 				return;
 			}
-			int max_memos = Config->GetModule("memoserv")->Get<int>("maxmemos");
+			int max_memos = Config->GetModule("memoserv/main")->Get<int>("maxmemos");
 			limit = -1;
 			try
 			{
@@ -272,7 +272,7 @@ class CommandMSSet : public Command
 			               "\002ON\002 is essentially \002LOGON\002 and \002NEW\002 combined."));
 		else if (subcommand.equals_ci("LIMIT"))
 		{
-			int max_memos = Config->GetModule("memoserv")->Get<int>("maxmemos");
+			int max_memos = Config->GetModule("memoserv/main")->Get<int>("maxmemos");
 			if (source.IsServicesOper())
 				source.Reply(_("Syntax: \002LIMIT [\037user\037 | \037channel\037] {\037limit\037 | NONE} [HARD]\002\n"
 				               "\n"