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

Fix importing Atheme mode locks.

Browse Source
This commit is contained in:
Sadie Powell
2024-06-20 16:57:11 +01:00
parent 60aeb2a71a
commit 016a5b3903
1 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/db_atheme.cpp
+31 -3
View File
@@ -85,16 +85,34 @@ public:
struct ModeData final
{
char letter;
Anope::string name;
Anope::string value;
bool set;
ModeData(const Anope::string &n, bool s, const Anope::string &v = "")
: name(n)
: letter(0)
, name(n)
, value(v)
, set(s)
{
}
ModeData(char l, const Anope::string &v = "")
: letter(l)
, value(v)
, set(true)
{
}
Anope::string str() const
{
std::stringstream buf;
buf << '+' << (name.empty() ? letter : name);
if (value.empty())
buf << ' ' << value;
return buf.str();
}
};
struct ChannelData final
@@ -969,6 +987,12 @@ private:
data->info_adder = value;
else if (key == "private:mark:timestamp")
data->info_ts = Anope::Convert<time_t>(value, 0);
else if (key == "private:mlockext")
{
spacesepstream mlocks(value);
for (Anope::string mlock; mlocks.GetToken(mlock); )
data->mlocks.emplace_back(mlock[0], mlock.substr(1));
}
else if (key == "private:templates")
return HandleIgnoreMetadata(ci->name, key, value);
else if (key == "private:topic:setter")
@@ -1558,10 +1582,14 @@ public:
for (const auto &mlock : data->mlocks)
{
auto mh = ModeManager::FindChannelModeByName(mlock.name);
ChannelMode *mh;
if (mlock.name.empty())
mh = ModeManager::FindChannelModeByChar(mlock.letter);
else
mh = ModeManager::FindChannelModeByName(mlock.name);
if (!mh)
{
Log(this) << "Unable to find mode while importing mode lock on " << ci->name << ": " << mlock.name;
Log(this) << "Unable to find mode while importing mode lock on " << ci->name << ": " << mlock.str();
continue;
}