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

Add the TRY_AGAIN_LATER message for when a command is unavailable.

Browse Source 
This replaces SERVICE_UNAVAILABLE and other custom messages.
This commit is contained in:
Sadie Powell
2025-11-24 23:56:23 +00:00
parent bee669b42e
commit e0331dae2a
15 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/language.h
+1 -1
View File
@@ -127,10 +127,10 @@ namespace Language
#define NO_EXPIRE _("does not expire")
#define PASSWORD_INCORRECT _("Password incorrect.")
#define READ_ONLY_MODE _("Services are temporarily in read-only mode.")
#define SERVICE_UNAVAILABLE _("Sorry, %s is temporarily unavailable.")
#define TIME_NEVER _("Never")
#define TIME_NOW _("Now")
#define TIME_UNKNOWN _("Unknown")
#define TRY_AGAIN_LATER _("The \002%s\002 command is temporarily unavailable. Please try again later.")
#define USERHOST_MASK_TOO_WIDE _("%s coverage is too wide; Please use a more specific mask.")
#define BOT_DOES_NOT_EXIST _("Bot \002%s\002 does not exist.")
language/anope.en_US.po
+6 -12
View File
@@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Anope\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-11-20 15:05+0000\n"
"PO-Revision-Date: 2025-11-20 15:05+0000\n"
"POT-Creation-Date: 2025-11-25 00:00+0000\n"
"PO-Revision-Date: 2025-11-25 00:00+0000\n"
"Last-Translator: Sadie Powell <sadie@witchery.services>\n"
"Language-Team: English\n"
"Language: en_US\n"
@@ -1359,9 +1359,6 @@ msgstr ""
msgid "Account registered"
msgstr ""
msgid "Accounts can not be registered right now. Please try again later."
msgstr ""
#, c-format
msgid "Accounts that are not used anymore are subject to the automatic expiration, i.e. they will be deleted after %s if not used."
msgstr ""
@@ -4223,9 +4220,6 @@ msgstr ""
msgid "Password reset email for %s has been sent."
msgstr ""
msgid "Passwords can not be changed right now. Please try again later."
msgstr ""
#, c-format
msgid "Passwords encrypted with %s: %zu"
msgstr ""
@@ -5092,10 +5086,6 @@ msgstr ""
msgid "Sorry, %s currently has too many memos and cannot receive more."
msgstr ""
#, c-format
msgid "Sorry, %s is temporarily unavailable."
msgstr ""
#, c-format
msgid "Sorry, I have not seen %s."
msgstr ""
@@ -5313,6 +5303,10 @@ msgid ""
"For a list of the features and functions whose levels can be set, see HELP%sDESC."
msgstr ""
#, c-format
msgid "The %s command is temporarily unavailable. Please try again later."
msgstr ""
#, c-format
msgid ""
"The %sADD command adds the given nickname to the %s list.\n"
modules/chanserv/cs_clone.cpp
+4 -1
View File
@@ -65,7 +65,10 @@ class CommandCSClone final
static void CopyAkick(CommandSource &source, ChannelInfo *ci, ChannelInfo *target_ci)
{
if (!ChanServ::akick_service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
ChanServ::akick_service->ClearAKick(target_ci);
for (unsigned i = 0; i < ChanServ::akick_service->GetAKickCount(ci); ++i)
@@ -87,7 +90,7 @@ class CommandCSClone final
if (!target_badwords || !badwords)
{
source.Reply(ACCESS_DENIED); // BotServ doesn't exist/badwords isn't loaded
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
modules/global/gl_global.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ public:
{
if (!Global::service)
{
source.Reply(SERVICE_UNAVAILABLE, source.service->nick.c_str());
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
modules/global/gl_queue.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ public:
{
if (!Global::service)
{
source.Reply(SERVICE_UNAVAILABLE, source.service->nick.c_str());
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
modules/global/gl_server.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ public:
{
if (!Global::service)
{
source.Reply(SERVICE_UNAVAILABLE, source.service->nick.c_str());
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
modules/memoserv/ms_rsend.cpp
+3
View File
@@ -28,7 +28,10 @@ public:
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
if (!MemoServ::service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
if (Anope::ReadOnly && !source.IsOper())
{
modules/memoserv/ms_send.cpp
+3
View File
@@ -28,7 +28,10 @@ public:
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
if (!MemoServ::service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
const Anope::string &nick = params[0];
const Anope::string &text = params[1];
modules/memoserv/ms_sendall.cpp
+3
View File
@@ -28,7 +28,10 @@ public:
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
if (!MemoServ::service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
const Anope::string &text = params[0];
modules/memoserv/ms_staff.cpp
+3
View File
@@ -28,7 +28,10 @@ public:
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
if (!MemoServ::service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
const Anope::string &text = params[0];
modules/nickserv/ns_register.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ public:
Anope::string encpass;
if (!Anope::Encrypt(pass, encpass))
{
source.Reply(_("Accounts can not be registered right now. Please try again later."));
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
modules/nickserv/ns_set.cpp
+2 -2
View File
@@ -144,7 +144,7 @@ public:
if (!Anope::Encrypt(param, nc->pass))
{
source.Reply(_("Passwords can not be changed right now. Please try again later."));
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
@@ -203,7 +203,7 @@ public:
if (!Anope::Encrypt(param, nc->pass))
{
source.Reply(_("Passwords can not be changed right now. Please try again later."));
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
modules/operserv/os_forbid.cpp
+3
View File
@@ -245,7 +245,10 @@ public:
void Execute(CommandSource &source, const std::vector<Anope::string> &params) override
{
if (!OperServ::forbid_service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
const Anope::string &command = params[0];
const Anope::string &subcommand = params.size() > 1 ? params[1] : "";
modules/operserv/os_ignore.cpp
+12
View File
@@ -214,7 +214,10 @@ private:
void DoAdd(CommandSource &source, const std::vector<Anope::string> &params)
{
if (!OperServ::ignore_service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
const Anope::string &time = params.size() > 1 ? params[1] : "";
const Anope::string &nick = params.size() > 2 ? params[2] : "";
@@ -268,7 +271,10 @@ private:
static void DoList(CommandSource &source)
{
if (!OperServ::ignore_service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
auto &ignores = OperServ::ignore_service->GetIgnores();
for (unsigned i = ignores.size(); i > 0; --i)
@@ -315,7 +321,10 @@ private:
void DoDel(CommandSource &source, const std::vector<Anope::string> &params)
{
if (!OperServ::ignore_service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
const Anope::string nick = params.size() > 1 ? params[1] : "";
if (nick.empty())
@@ -348,7 +357,10 @@ private:
void DoClear(CommandSource &source)
{
if (!OperServ::ignore_service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
if (Anope::ReadOnly)
source.Reply(READ_ONLY_MODE);
modules/operserv/os_news.cpp
+3
View File
@@ -290,7 +290,10 @@ protected:
void DoNews(CommandSource &source, const std::vector<Anope::string> &params, OperServ::NewsType ntype)
{
if (!OperServ::news_service)
{
source.Reply(TRY_AGAIN_LATER, source.command.nobreak().c_str());
return;
}
const Anope::string &cmd = params[0];