From 7640fad30cc2a3d61e67a7075c27f26400d4779f Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 27 Feb 2024 10:16:05 +0000 Subject: Simplify several boolean expressions. --- modules/chanserv/cs_flags.cpp | 6 ++---- modules/chanserv/cs_topic.cpp | 2 +- modules/chanserv/cs_unban.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'modules/chanserv') diff --git a/modules/chanserv/cs_flags.cpp b/modules/chanserv/cs_flags.cpp index 38de5c49f..0c1e088da 100644 --- a/modules/chanserv/cs_flags.cpp +++ b/modules/chanserv/cs_flags.cpp @@ -26,9 +26,7 @@ public: bool HasPriv(const Anope::string &priv) const override { std::map::iterator it = defaultFlags.find(priv); - if (it != defaultFlags.end() && this->flags.count(it->second) > 0) - return true; - return false; + return it != defaultFlags.end() && this->flags.count(it->second) > 0; } Anope::string AccessSerialize() const override @@ -324,7 +322,7 @@ class CommandCSFlags final for (size_t j = 1; j < arg.length(); ++j) if (flags.find(arg[j]) == Anope::string::npos) pass = false; - if (pass == false) + if (!pass) continue; } else if (!Anope::Match(access->Mask(), arg)) diff --git a/modules/chanserv/cs_topic.cpp b/modules/chanserv/cs_topic.cpp index f774dca65..f21ea11f8 100644 --- a/modules/chanserv/cs_topic.cpp +++ b/modules/chanserv/cs_topic.cpp @@ -262,7 +262,7 @@ public: ModeLocks *ml = ci->GetExt("modelocks"); const ModeLock *secret = ml ? ml->GetMLock("SECRET") : NULL; - if (!ci->last_topic.empty() && (show_all || ((!secret || secret->set == false) && (!ci->c || !ci->c->HasMode("SECRET"))))) + if (!ci->last_topic.empty() && (show_all || ((!secret || !secret->set) && (!ci->c || !ci->c->HasMode("SECRET"))))) { info[_("Last topic")] = ci->last_topic; info[_("Topic set by")] = ci->last_topic_setter; diff --git a/modules/chanserv/cs_unban.cpp b/modules/chanserv/cs_unban.cpp index c214136eb..5b08511b3 100644 --- a/modules/chanserv/cs_unban.cpp +++ b/modules/chanserv/cs_unban.cpp @@ -81,7 +81,7 @@ public: } if (!source.AccessFor(ci).HasPriv("UNBAN") && - !(u2 == source.GetUser() && source.AccessFor(ci).HasPriv("UNBANME")) && + (u2 != source.GetUser() || !source.AccessFor(ci).HasPriv("UNBANME")) && !source.HasPriv("chanserv/kick")) { source.Reply(ACCESS_DENIED); -- cgit