pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-12 19:14:47 +02:00
Code Activity

If the IRCd sends a field limit then use it over that of the config.

Browse Source
This commit is contained in:
Sadie Powell
2024-02-22 15:58:23 +00:00
parent 84ad85ee85
commit c4e9c0bf85
22 changed files with 251 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/botserv/bs_bot.cpp
+13 -16
View File
@@ -28,23 +28,21 @@ private:
return;
}
Configuration::Block *networkinfo = Config->GetBlock("networkinfo");
if (nick.length() > networkinfo->Get<unsigned>("nicklen"))
if (nick.length() > IRCD->GetMaxNick())
{
source.Reply(_("Bot nicks may only be %d characters long."), networkinfo->Get<unsigned>("nicklen"));
source.Reply(_("Bot nicks may only be %zu characters long."), IRCD->GetMaxNick());
return;
}
if (user.length() > networkinfo->Get<unsigned>("userlen"))
if (user.length() > IRCD->GetMaxUser())
{
source.Reply(_("Bot idents may only be %d characters long."), networkinfo->Get<unsigned>("userlen"));
source.Reply(_("Bot idents may only be %zu characters long."), IRCD->GetMaxUser());
return;
}
if (host.length() > networkinfo->Get<unsigned>("hostlen"))
if (host.length() > IRCD->GetMaxHost())
{
source.Reply(_("Bot hosts may only be %d characters long."), networkinfo->Get<unsigned>("hostlen"));
source.Reply(_("Bot hosts may only be %zu characters long."), IRCD->GetMaxHost());
return;
}
@@ -120,23 +118,22 @@ private:
return;
}
Configuration::Block *networkinfo = Config->GetBlock("networkinfo");
if (nick.length() > networkinfo->Get<unsigned>("nicklen"))
if (nick.length() > IRCD->GetMaxNick())
{
source.Reply(_("Bot nicks may only be %d characters long."), networkinfo->Get<unsigned>("nicklen"));
source.Reply(_("Bot nicks may only be %zu characters long."), IRCD->GetMaxNick());
return;
}
if (user.length() > networkinfo->Get<unsigned>("userlen"))
if (user.length() > IRCD->GetMaxUser())
{
source.Reply(_("Bot idents may only be %d characters long."), networkinfo->Get<unsigned>("userlen"));
source.Reply(_("Bot idents may only be %zu characters long."), IRCD->GetMaxUser());
return;
}
if (host.length() > networkinfo->Get<unsigned>("hostlen"))
if (host.length() > IRCD->GetMaxHost())
{
source.Reply(_("Bot hosts may only be %d characters long."), networkinfo->Get<unsigned>("hostlen"));
source.Reply(_("Bot hosts may only be %zu characters long."), IRCD->GetMaxHost()
);
return;
}