Remove the Kiwi links from the readme.

[user/henk/code/inspircd.git] / include / numericbuilder.h

diff --git a/include/numericbuilder.h b/include/numericbuilder.h
index f9ca26f81920e5a46ce23d4b5de4c6334af716ce..a077c666deaa9ff67e1d1261281a487d2b492d1e 100644 (file)
--- a/include/numericbuilder.h
+++ b/include/numericbuilder.h
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2018-2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2018-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2015-2016 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -86,7 +86,7 @@ class Numeric::GenericBuilder
        GenericBuilder(Sink s, unsigned int num, bool addparam = true, size_t additionalsize = 0)
                : sink(s)
                , numeric(num)
-               , max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->ServerName.size() - additionalsize - 10)
+               , max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->GetServerName().size() - additionalsize - 10)
        {
                if (addparam)
                        numeric.push(std::string());
@@ -156,7 +156,7 @@ class Numeric::GenericParamBuilder
                : sink(s)
                , numeric(num)
                , currlen(0)
-               , max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->ServerName.size() - additionalsize - 10)
+               , max(ServerInstance->Config->Limits.MaxLine - ServerInstance->Config->GetServerName().size() - additionalsize - 10)
        {
        }
 
@@ -229,19 +229,19 @@ class Numerics::CannotSendTo : public Numeric::Numeric
                : Numeric(ERR_CANNOTSENDTOCHAN)
        {
                push(chan->name);
-               push(InspIRCd::Format("You cannot send %s to this channel whilst %s %c: (%s) extban is set on you.",
+               push(InspIRCd::Format("You cannot send %s to this channel whilst %s %c: (%s) extban is set matching you.",
                        what.c_str(), strchr("AEIOUaeiou", extban) ? "an" : "a", extban, extbandesc.c_str()));
        }
 
        CannotSendTo(User* user, const std::string& message)
-               : Numeric(ERR_CANNOTSENDTOCHAN)
+               : Numeric(ERR_CANTSENDTOUSER)
        {
                push(user->registered & REG_NICK ? user->nick : "*");
                push(message);
        }
 
        CannotSendTo(User* user, const std::string& what, ModeHandler* mh, bool self = false)
-               : Numeric(ERR_CANNOTSENDTOCHAN)
+               : Numeric(ERR_CANTSENDTOUSER)
        {
                push(user->registered & REG_NICK ? user->nick : "*");
                push(InspIRCd::Format("You cannot send %s to this user whilst %s have the +%c (%s) mode set.",