summaryrefslogtreecommitdiff
path: root/modules/xmlrpc_main.cpp
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2024-03-11 13:53:05 +0000
committerSadie Powell <sadie@witchery.services>2024-03-11 19:17:29 +0000
commit29e7674e56bf2b829bba22def2760d034a76e788 (patch)
treef40049ba995b03dd7c510d88f9f19db2d2e65a2e /modules/xmlrpc_main.cpp
parente2df7d4d01f8fdb41c49ce8efc462cab005e7d5c (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/xmlrpc_main.cpp')
-rw-r--r--modules/xmlrpc_main.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/modules/xmlrpc_main.cpp b/modules/xmlrpc_main.cpp
index dedb587f9..abf648da8 100644
--- a/modules/xmlrpc_main.cpp
+++ b/modules/xmlrpc_main.cpp
@@ -141,7 +141,7 @@ private:
static void DoStats(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request)
{
- request.reply("uptime", stringify(Anope::CurTime - Anope::StartTime));
+ request.reply("uptime", Anope::ToString(Anope::CurTime - Anope::StartTime));
request.reply("uplinkname", Me->GetLinks().front()->GetName());
{
Anope::string buf;
@@ -151,9 +151,9 @@ private:
buf.erase(buf.begin());
request.reply("uplinkcapab", buf);
}
- request.reply("usercount", stringify(UserListByNick.size()));
- request.reply("maxusercount", stringify(MaxUserCount));
- request.reply("channelcount", stringify(ChannelList.size()));
+ request.reply("usercount", Anope::ToString(UserListByNick.size()));
+ request.reply("maxusercount", Anope::ToString(MaxUserCount));
+ request.reply("channelcount", Anope::ToString(ChannelList.size()));
}
static void DoChannel(XMLRPCServiceInterface *iface, HTTPClient *client, XMLRPCRequest &request)
@@ -167,20 +167,20 @@ private:
if (c)
{
- request.reply("bancount", stringify(c->HasMode("BAN")));
+ request.reply("bancount", Anope::ToString(c->HasMode("BAN")));
int count = 0;
for (auto &ban : c->GetModeList("BAN"))
- request.reply("ban" + stringify(++count), iface->Sanitize(ban));
+ request.reply("ban" + Anope::ToString(++count), iface->Sanitize(ban));
- request.reply("exceptcount", stringify(c->HasMode("EXCEPT")));
+ request.reply("exceptcount", Anope::ToString(c->HasMode("EXCEPT")));
count = 0;
for (auto &except : c->GetModeList("EXCEPT"))
- request.reply("except" + stringify(++count), iface->Sanitize(except));
+ request.reply("except" + Anope::ToString(++count), iface->Sanitize(except));
- request.reply("invitecount", stringify(c->HasMode("INVITEOVERRIDE")));
+ request.reply("invitecount", Anope::ToString(c->HasMode("INVITEOVERRIDE")));
count = 0;
for (auto &invite : c->GetModeList("INVITEOVERRIDE"))
- request.reply("invite" + stringify(++count), iface->Sanitize(invite));
+ request.reply("invite" + Anope::ToString(++count), iface->Sanitize(invite));
Anope::string users;
for (Channel::ChanUserList::const_iterator it = c->users.begin(); it != c->users.end(); ++it)
@@ -200,8 +200,8 @@ private:
if (!c->topic_setter.empty())
request.reply("topicsetter", iface->Sanitize(c->topic_setter));
- request.reply("topictime", stringify(c->topic_time));
- request.reply("topicts", stringify(c->topic_ts));
+ request.reply("topictime", Anope::ToString(c->topic_time));
+ request.reply("topicts", Anope::ToString(c->topic_ts));
}
}
@@ -224,8 +224,8 @@ private:
if (!u->chost.empty())
request.reply("chost", iface->Sanitize(u->chost));
request.reply("ip", u->ip.addr());
- request.reply("timestamp", stringify(u->timestamp));
- request.reply("signon", stringify(u->signon));
+ request.reply("timestamp", Anope::ToString(u->timestamp));
+ request.reply("signon", Anope::ToString(u->signon));
if (u->Account())
{
request.reply("account", iface->Sanitize(u->Account()->display));