diff options
| author | Sadie Powell <sadie@witchery.services> | 2021-08-01 19:23:48 +0100 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2021-08-01 19:23:48 +0100 |
| commit | e7e8447fa39ced57743eab51e8e2835ddddd7001 (patch) | |
| tree | 2bc8d31f575616e612c0d7e3898bd94bd9165b18 /modules/commands | |
| parent | 561b205c4a3a125c12a7926ef18fa1eb822c387c (diff) | |
Deduplicate code for checking if a user is securely connected.
Diffstat (limited to 'modules/commands')
| -rw-r--r-- | modules/commands/cs_enforce.cpp | 2 | ||||
| -rw-r--r-- | modules/commands/ns_ajoin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp index 8f21c8c35..968bd25cc 100644 --- a/modules/commands/cs_enforce.cpp +++ b/modules/commands/cs_enforce.cpp @@ -119,7 +119,7 @@ class CommandCSEnforce : public Command if (user->IsProtected()) continue; - if (!user->HasMode("SSL") && !user->HasExt("ssl")) + if (!user->IsSecurelyConnected()) users.push_back(user); } diff --git a/modules/commands/ns_ajoin.cpp b/modules/commands/ns_ajoin.cpp index 4f4c75e1a..f2ea92c56 100644 --- a/modules/commands/ns_ajoin.cpp +++ b/modules/commands/ns_ajoin.cpp @@ -356,7 +356,7 @@ class NSAJoin : public Module continue; else if (c->HasMode("ADMINONLY") && !u->HasMode("ADMIN")) continue; - else if (c->HasMode("SSL") && !(u->HasMode("SSL") || u->HasExt("ssl"))) + else if (c->HasMode("SSL") && !u->IsSecurelyConnected()) continue; else if (c->MatchesList(u, "BAN") == true && c->MatchesList(u, "EXCEPT") == false) need_invite = true; |