pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-04 05:03:11 +02:00
Code Activity

Improve the BotServ fantasy commands

Browse Source 
- Allow multiple character fantasy prefixes.
- Allow using the command alias as the command prefix.
- Match the service name case insensitively.
This commit is contained in:
Sadie Powell
2025-12-14 01:34:57 +00:00
parent 852aae5e4f
commit 57446ee49b
4 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/fantasy.cpp
+26 -15
View File
@@ -75,13 +75,13 @@ public:
"Enables or disables \002fantasy\002 mode on a channel. "
"When it is enabled, users will be able to use "
"fantasy commands on a channel when prefixed "
"with one of the following fantasy characters: \002%s\002"
"with one of the following fantasy prefixes: \002%s\002"
"\n\n"
"Note that users wanting to use fantasy commands "
"MUST have enough access for both the FANTASY "
"privilege and the command they are executing."
),
Config->GetModule(this->owner).Get<const Anope::string>("fantasycharacter", "!").c_str());
Config->GetModule(this->owner).Get<const Anope::string>("prefix", "!").c_str());
return true;
}
};
@@ -89,16 +89,26 @@ public:
class Fantasy final
: public Module
{
private:
SerializableExtensibleItem<bool> fantasy;
CommandBSSetFantasy commandbssetfantasy;
std::vector<Anope::string> prefixes;
public:
Fantasy(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, VENDOR),
fantasy(this, "BS_FANTASY"), commandbssetfantasy(this)
Fantasy(const Anope::string &modname, const Anope::string &creator)
: Module(modname, creator, VENDOR)
, fantasy(this, "BS_FANTASY")
, commandbssetfantasy(this)
{
}
void OnReload(Configuration::Conf &conf) override
{
const auto &modconf = conf.GetModule(this);
const auto &prefix = modconf.Get<const Anope::string>("prefix", "!");
spacesepstream(prefix).GetTokens(prefixes);
}
void OnPrivmsg(User *u, Channel *c, Anope::string &msg, const Anope::map<Anope::string> &tags) override
{
if (!u || !c || !c->ci || !c->ci->bi || msg.empty() || msg[0] == '\1')
@@ -114,23 +124,24 @@ public:
return;
Anope::string normalized_param0 = Anope::RemoveFormatting(params[0]);
Anope::string fantasy_chars = Config->GetModule(this).Get<Anope::string>("fantasycharacter", "!");
if (!normalized_param0.find(c->ci->bi->nick))
if (normalized_param0.find_ci(c->ci->bi->nick) == 0)
{
params.erase(params.begin());
}
else if (!normalized_param0.find_first_of(fantasy_chars))
else
{
size_t sz = params[0].find_first_of(fantasy_chars);
auto fn = [&normalized_param0](const auto &prefix) { return normalized_param0.find(prefix) == 0; };
auto it = std::find_if(prefixes.begin(), prefixes.end(), fn);
if (it == prefixes.end())
return;
auto sz = params[0].find(*it);
if (sz == Anope::string::npos)
return; /* normalized_param0 is a subset of params[0] so this can't happen */
params[0].erase(0, sz + 1);
}
else
{
return;
params[0].erase(0, sz + it->length());
if (params[0].equals_ci(c->ci->bi->alias))
params.erase(params.begin());
}
if (params.empty())