pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-26 21:56:38 +02:00
Code Activity

Make CTCP support more modular.

Browse Source
This commit is contained in:
Sadie Powell
2025-05-10 14:15:27 +01:00
parent 7b2f0f5790
commit 50030e07fa
3 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/bots.h
+2
View File
@@ -41,6 +41,8 @@ public:
time_t lastmsg;
/* Map of actual command names -> service name/permission required */
CommandInfo::map commands;
/** CTCP responses this bot can send. */
Anope::map<std::function<void(BotInfo *, User *, const Anope::string &)>> ctcps;
/* The server-side alias used to message this bot. */
Anope::string alias;
/* Modes the bot should have as configured in service:modes */
src/bots.cpp
+30
View File
@@ -34,6 +34,36 @@ BotInfo::BotInfo(const Anope::string &nnick, const Anope::string &nuser, const A
if (!this->uid.empty())
(*BotListByUID)[this->uid] = this;
ctcps.emplace("CLIENTINFO", [this](auto *bi, auto *u, const auto &)
{
Anope::string buf;
for (const auto &[ctcp, _] : this->ctcps)
{
if (!buf.empty())
buf.push_back(' ');
buf.append(ctcp.upper());
}
IRCD->SendNotice(bi, u->GetUID(), Anope::FormatCTCP("CLIENTINFO", buf));
});
ctcps.emplace("PING", [](auto *bi, auto *u, const auto &ctcpbody)
{
IRCD->SendNotice(bi, u->GetUID(), Anope::FormatCTCP("PING", ctcpbody));
});
ctcps.emplace("SOURCE", [](auto *bi, auto *u, const auto &)
{
IRCD->SendNotice(bi, u->GetUID(), Anope::FormatCTCP("SOURCE", "https://www.anope.org/"));
});
ctcps.emplace("TIME", [](auto *bi, auto *u, const auto &)
{
IRCD->SendNotice(bi, u->GetUID(), Anope::FormatCTCP("TIME", Anope::strftime(Anope::CurTime, nullptr, true)));
});
ctcps.emplace("VERSION", [](auto *bi, auto *u, const auto &)
{
auto *enc = ModuleManager::FindFirstOf(ENCRYPTION);
IRCD->SendNotice(bi, u->GetUID(), Anope::FormatCTCP("VERSION", Anope::printf("Anope-%s %s -- %s -- %s", Anope::Version().c_str(),
Anope::VersionBuildString().c_str(), IRCD->GetProtocolName().c_str(), enc ? enc->name.c_str() : "(none)")));
});
FOREACH_MOD(OnCreateBot, (this));
// If we're synchronised with the uplink already, send the bot.
src/messages.cpp
+3 -10
View File
@@ -340,16 +340,9 @@ void Privmsg::Run(MessageSource &source, const std::vector<Anope::string> &param
Anope::string ctcpname, ctcpbody;
if (Anope::ParseCTCP(message, ctcpname, ctcpbody))
{
if (ctcpname.equals_ci("PING"))
{
IRCD->SendNotice(bi, u->nick, Anope::FormatCTCP("PING", ctcpbody));
}
else if (ctcpname.equals_ci("VERSION"))
{
Module *enc = ModuleManager::FindFirstOf(ENCRYPTION);
IRCD->SendNotice(bi, u->nick, Anope::FormatCTCP("VERSION", Anope::printf("Anope-%s %s -- %s -- %s", Anope::Version().c_str(),
Anope::VersionBuildString().c_str(), IRCD->GetProtocolName().c_str(), enc ? enc->name.c_str() : "(none)")));
}
auto ctcpit = bi->ctcps.find(ctcpname);
if (ctcpit != bi->ctcps.end())
ctcpit->second(bi, u, ctcpbody);
return;
}