diff options
| author |  Sadie Powell | 2023-01-24 02:58:46 +0000 |
|---|---|---|
| committer | Sadie Powell | 2023-01-24 02:58:46 +0000 |
| commit | f310e1c98dc262249146025ffffb81334b38680d (patch) | |
| tree | edd19152137e71db58efc5fbd289f34ce9b6919b /include/modules | |
| parent | Clean up some remaining old format string stuff. (diff) | |
Refactor the caching methods in User and rename to make more sense.
Diffstat (limited to 'include/modules')
| -rw-r--r-- | include/modules/shun.h | 4 | ||||
| -rw-r--r-- | include/modules/sql.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/modules/shun.h b/include/modules/shun.h index a162c0581..95f5bba6b 100644 --- a/include/modules/shun.h +++ b/include/modules/shun.h @@ -47,10 +47,10 @@ public: if (lu && lu->exempt) return false; - if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext) || InspIRCd::Match(u->nick+"!"+u->ident+"@"+u->GetIPString(), matchtext)) + if (InspIRCd::Match(u->GetMask(), matchtext) || InspIRCd::Match(u->GetRealMask(), matchtext) || InspIRCd::Match(u->nick+"!"+u->ident+"@"+u->GetAddress(), matchtext)) return true; - if (InspIRCd::MatchCIDR(u->GetIPString(), matchtext, ascii_case_insensitive_map)) + if (InspIRCd::MatchCIDR(u->GetAddress(), matchtext, ascii_case_insensitive_map)) return true; return false; diff --git a/include/modules/sql.h b/include/modules/sql.h index 2f7557fdd..986a30204 100644 --- a/include/modules/sql.h +++ b/include/modules/sql.h @@ -236,7 +236,7 @@ inline void SQL::PopulateUserInfo(User* user, ParamMap& userinfo) { userinfo["nick"] = user->nick; userinfo["host"] = user->GetRealHost(); - userinfo["ip"] = user->GetIPString(); + userinfo["ip"] = user->GetAddress(); userinfo["real"] = user->GetRealName(); userinfo["ident"] = user->ident; userinfo["server"] = user->server->GetName(); |