diff options
| author | Sadie Powell <sadie@witchery.services> | 2024-03-11 13:53:05 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2024-03-11 19:17:29 +0000 |
| commit | 29e7674e56bf2b829bba22def2760d034a76e788 (patch) | |
| tree | f40049ba995b03dd7c510d88f9f19db2d2e65a2e /modules/nickserv/ns_ajoin.cpp | |
| parent | e2df7d4d01f8fdb41c49ce8efc462cab005e7d5c (diff) | |
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.
Diffstat (limited to 'modules/nickserv/ns_ajoin.cpp')
| -rw-r--r-- | modules/nickserv/ns_ajoin.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/modules/nickserv/ns_ajoin.cpp b/modules/nickserv/ns_ajoin.cpp index f6e716a36..91e700e4a 100644 --- a/modules/nickserv/ns_ajoin.cpp +++ b/modules/nickserv/ns_ajoin.cpp @@ -105,7 +105,7 @@ class CommandNSAJoin final { AJoinEntry *aj = (*channels)->at(i); ListFormatter::ListEntry entry; - entry["Number"] = stringify(i + 1); + entry["Number"] = Anope::ToString(i + 1); entry["Channel"] = aj->channel; entry["Key"] = aj->key; list.AddEntry(entry); @@ -382,13 +382,11 @@ public: Anope::string l; if (c->GetParam("LIMIT", l)) { - try + if (auto limit = Anope::TryConvert<unsigned>(l)) { - unsigned limit = convertTo<unsigned>(l); - if (c->users.size() >= limit) + if (c->users.size() >= limit.value()) need_invite = true; } - catch (const ConvertException &) { } } } } |