From f310e1c98dc262249146025ffffb81334b38680d Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 24 Jan 2023 02:58:46 +0000
Subject: Refactor the caching methods in User and rename to make more sense.

---
 include/modules/shun.h | 4 ++--
 include/modules/sql.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/modules')

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();
-- 
cgit v1.3.1-10-gc9f91