diff options
| author |  Sadie Powell | 2022-11-24 19:16:25 +0000 |
|---|---|---|
| committer | Sadie Powell | 2022-11-24 19:16:25 +0000 |
| commit | b045f49afbb7e0b0af7bae84f075d3e0660b39e6 (patch) | |
| tree | 390de1d1664cb157b0ce4c1ee2d266a55733efaa /src/modules/m_silence.cpp | |
| parent | Use string_view in IsNick/IsIdent/IsChannel. (diff) | |
| parent | Add a workaround for the replies API not working with a cap reference. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_silence.cpp')
| -rw-r--r-- | src/modules/m_silence.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index d2d989cc7..dc2e857ea 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -106,7 +106,7 @@ public: } // Converts a flag list to a bitmask. - static bool FlagsToBits(const std::string& flags, uint32_t& out) + static bool FlagsToBits(const std::string& flags, uint32_t& out, bool strict) { out = SF_NONE; for (const auto& flag : flags) @@ -147,6 +147,8 @@ public: out |= SF_EXEMPT; break; default: + if (!strict) + continue; out = SF_NONE; return false; } @@ -233,7 +235,7 @@ public: // Try to parse the flags. uint32_t flags; - if (!SilenceEntry::FlagsToBits(flagstr, flags)) + if (!SilenceEntry::FlagsToBits(flagstr, flags, false)) { ServerInstance->Logs.Debug(MODNAME, "Malformed silence flags received for %s: %s", user->uuid.c_str(), flagstr.c_str()); @@ -377,7 +379,7 @@ public: uint32_t flags = SilenceEntry::SF_DEFAULT; if (parameters.size() > 1) { - if (!SilenceEntry::FlagsToBits(parameters[1], flags)) + if (!SilenceEntry::FlagsToBits(parameters[1], flags, true)) { user->WriteNumeric(ERR_SILENCE, mask, parameters[1], "You specified one or more invalid SILENCE flags"); return CmdResult::FAILURE; |