From 29e7674e56bf2b829bba22def2760d034a76e788 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Mon, 11 Mar 2024 13:53:05 +0000
Subject: Replace convertTo/stringify with non-throwing alternatives.

Having these throw is terrible for ergonomics and there are loads
of places where the exception was either silently ignored or not
handled at all. Having a function which returns an optional and
another that returns a default works a lot better imo.
---
 modules/memoserv/memoserv.cpp |  4 ++--
 modules/memoserv/ms_list.cpp  |  4 ++--
 modules/memoserv/ms_set.cpp   | 16 ++++------------
 3 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'modules/memoserv')

diff --git a/modules/memoserv/memoserv.cpp b/modules/memoserv/memoserv.cpp
index 45642b46d..084650542 100644
--- a/modules/memoserv/memoserv.cpp
+++ b/modules/memoserv/memoserv.cpp
@@ -24,13 +24,13 @@ class MemoServCore final
 
 		subject = subject.replace_all_cs("%n", nc->display);
 		subject = subject.replace_all_cs("%s", m->sender);
-		subject = subject.replace_all_cs("%d", stringify(mi->GetIndex(m) + 1));
+		subject = subject.replace_all_cs("%d", Anope::ToString(mi->GetIndex(m) + 1));
 		subject = subject.replace_all_cs("%t", m->text);
 		subject = subject.replace_all_cs("%N", Config->GetBlock("networkinfo")->Get<const Anope::string>("networkname"));
 
 		message = message.replace_all_cs("%n", nc->display);
 		message = message.replace_all_cs("%s", m->sender);
-		message = message.replace_all_cs("%d", stringify(mi->GetIndex(m) + 1));
+		message = message.replace_all_cs("%d", Anope::ToString(mi->GetIndex(m) + 1));
 		message = message.replace_all_cs("%t", m->text);
 		message = message.replace_all_cs("%N", Config->GetBlock("networkinfo")->Get<const Anope::string>("networkname"));
 
diff --git a/modules/memoserv/ms_list.cpp b/modules/memoserv/ms_list.cpp
index 127cfdaaf..a25a95ed0 100644
--- a/modules/memoserv/ms_list.cpp
+++ b/modules/memoserv/ms_list.cpp
@@ -85,7 +85,7 @@ public:
 						const Memo *m = mi->GetMemo(number - 1);
 
 						ListFormatter::ListEntry entry;
-						entry["Number"] = (m->unread ? "* " : "  ") + stringify(number);
+						entry["Number"] = (m->unread ? "* " : "  ") + Anope::ToString(number);
 						entry["Sender"] = m->sender;
 						entry["Date/Time"] = Anope::strftime(m->time, source.GetAccount());
 						this->list.AddEntry(entry);
@@ -120,7 +120,7 @@ public:
 					const Memo *m = mi->GetMemo(i);
 
 					ListFormatter::ListEntry entry;
-					entry["Number"] = (m->unread ? "* " : "  ") + stringify(i + 1);
+					entry["Number"] = (m->unread ? "* " : "  ") + Anope::ToString(i + 1);
 					entry["Sender"] = m->sender;
 					entry["Date/Time"] = Anope::strftime(m->time, source.GetAccount());
 					list.AddEntry(entry);
diff --git a/modules/memoserv/ms_set.cpp b/modules/memoserv/ms_set.cpp
index 83b28fb20..54ad7c252 100644
--- a/modules/memoserv/ms_set.cpp
+++ b/modules/memoserv/ms_set.cpp
@@ -135,12 +135,8 @@ private:
 				else
 					nc->Shrink<bool>("MEMO_HARDMAX");
 			}
-			limit = -1;
-			try
-			{
-				limit = convertTo<int16_t>(p1);
-			}
-			catch (const ConvertException &) { }
+
+			limit = Anope::Convert<int16_t>(p1, -1);
 		}
 		else
 		{
@@ -160,12 +156,8 @@ private:
 				return;
 			}
 			int max_memos = Config->GetModule("memoserv")->Get<int>("maxmemos");
-			limit = -1;
-			try
-			{
-				limit = convertTo<int16_t>(p1);
-			}
-			catch (const ConvertException &) { }
+			limit = Anope::Convert<int16_t>(p1, -1);
+
 			/* The first character is a digit, but we could still go negative
 			 * from overflow... watch out! */
 			if (limit < 0 || (max_memos > 0 && limit > max_memos))
-- 
cgit