Move most of the core pseudoclient logic to modules

6 files changed, 20 insertions, 19 deletions

diff --git a/modules/encryption/enc_bcrypt.cpp b/modules/encryption/enc_bcrypt.cpp
index 020bafe6e..296d81b53 100644
--- a/modules/encryption/enc_bcrypt.cpp
+++ b/modules/encryption/enc_bcrypt.cpp
@@ -839,6 +839,7 @@ char *_crypt_gensalt_blowfish_rn(const char *prefix, unsigned long count,
 
 #include "module.h"
 #include "modules/encryption.h"
+#include "modules/nickserv.h"
 
 class EBCRYPT : public Module
 	, public EventHook<Event::Encrypt>
@@ -897,12 +898,12 @@ class EBCRYPT : public Module
 		return EVENT_ALLOW;
 	}
 
-	void OnCheckAuthentication(User *, IdentifyRequest *req) override
+	void OnCheckAuthentication(User *, NickServ::IdentifyRequest *req) override
 	{
-		const NickAlias *na = NickAlias::Find(req->GetAccount());
+		const NickServ::Nick *na = NickServ::FindNick(req->GetAccount());
 		if (na == NULL)
 			return;
-		NickCore *nc = na->nc;
+		NickServ::Account *nc = na->nc;
 
 		size_t pos = nc->pass.find(':');
 		if (pos == Anope::string::npos)
diff --git a/modules/encryption/enc_md5.cpp b/modules/encryption/enc_md5.cpp
index 108fb2504..442918aa6 100644
--- a/modules/encryption/enc_md5.cpp
+++ b/modules/encryption/enc_md5.cpp
@@ -284,7 +284,7 @@ class MD5Context : public Encryption::Context
 
 	/* MD5 finalization. Ends an MD5 message-digest opera
 	 * the message digest and zeroizing the context.
-	 */  
+	 */
 	void Finalize() override
 	{
 		unsigned char bits[8];
@@ -369,12 +369,12 @@ class EMD5 : public Module
 		return EVENT_ALLOW;
 	}
 
-	void OnCheckAuthentication(User *, IdentifyRequest *req) override
+	void OnCheckAuthentication(User *, NickServ::IdentifyRequest *req) override
 	{
-		const NickAlias *na = NickAlias::Find(req->GetAccount());
+		const NickServ::Nick *na = NickServ::FindNick(req->GetAccount());
 		if (na == NULL)
 			return;
-		NickCore *nc = na->nc;
+		NickServ::Account *nc = na->nc;
 
 		size_t pos = nc->pass.find(':');
 		if (pos == Anope::string::npos)
diff --git a/modules/encryption/enc_none.cpp b/modules/encryption/enc_none.cpp
index 1346177f7..8781be910 100644
--- a/modules/encryption/enc_none.cpp
+++ b/modules/encryption/enc_none.cpp
@@ -44,12 +44,12 @@ class ENone : public Module
 		return EVENT_ALLOW;
 	}
 
-	void OnCheckAuthentication(User *, IdentifyRequest *req) override
+	void OnCheckAuthentication(User *, NickServ::IdentifyRequest *req) override
 	{
-		const NickAlias *na = NickAlias::Find(req->GetAccount());
+		const NickServ::Nick *na = NickServ::FindNick(req->GetAccount());
 		if (na == NULL)
 			return;
-		NickCore *nc = na->nc;
+		NickServ::Account *nc = na->nc;
 
 		size_t pos = nc->pass.find(':');
 		if (pos == Anope::string::npos)
diff --git a/modules/encryption/enc_old.cpp b/modules/encryption/enc_old.cpp
index 671921c72..f36b2236b 100644
--- a/modules/encryption/enc_old.cpp
+++ b/modules/encryption/enc_old.cpp
@@ -85,12 +85,12 @@ class EOld : public Module
 		return EVENT_ALLOW;
 	}
 
-	void OnCheckAuthentication(User *, IdentifyRequest *req) override
+	void OnCheckAuthentication(User *, NickServ::IdentifyRequest *req) override
 	{
-		const NickAlias *na = NickAlias::Find(req->GetAccount());
+		const NickServ::Nick *na = NickServ::FindNick(req->GetAccount());
 		if (na == NULL)
 			return;
-		NickCore *nc = na->nc;
+		NickServ::Account *nc = na->nc;
 
 		size_t pos = nc->pass.find(':');
 		if (pos == Anope::string::npos)
diff --git a/modules/encryption/enc_sha1.cpp b/modules/encryption/enc_sha1.cpp
index df7de4f72..d2189a941 100644
--- a/modules/encryption/enc_sha1.cpp
+++ b/modules/encryption/enc_sha1.cpp
@@ -224,12 +224,12 @@ class ESHA1 : public Module
 		return EVENT_ALLOW;
 	}
 
-	void OnCheckAuthentication(User *, IdentifyRequest *req) override
+	void OnCheckAuthentication(User *, NickServ::IdentifyRequest *req) override
 	{
-		const NickAlias *na = NickAlias::Find(req->GetAccount());
+		const NickServ::Nick *na = NickServ::FindNick(req->GetAccount());
 		if (na == NULL)
 			return;
-		NickCore *nc = na->nc;
+		NickServ::Account *nc = na->nc;
 
 		size_t pos = nc->pass.find(':');
 		if (pos == Anope::string::npos)
diff --git a/modules/encryption/enc_sha256.cpp b/modules/encryption/enc_sha256.cpp
index 9cd682c57..b8c5c8e76 100644
--- a/modules/encryption/enc_sha256.cpp
+++ b/modules/encryption/enc_sha256.cpp
@@ -306,12 +306,12 @@ class ESHA256 : public Module
 		return EVENT_ALLOW;
 	}
 
-	void OnCheckAuthentication(User *, IdentifyRequest *req) override
+	void OnCheckAuthentication(User *, NickServ::IdentifyRequest *req) override
 	{
-		const NickAlias *na = NickAlias::Find(req->GetAccount());
+		const NickServ::Nick *na = NickServ::FindNick(req->GetAccount());
 		if (na == NULL)
 			return;
-		NickCore *nc = na->nc;
+		NickServ::Account *nc = na->nc;
 
 		size_t pos = nc->pass.find(':');
 		if (pos == Anope::string::npos)