Also match account bans against grouped nicknames.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/modules/m_account.cpp b/src/modules/m_account.cpp
index a260c7582..c8952dc57 100644
--- a/src/modules/m_account.cpp
+++ b/src/modules/m_account.cpp
@@ -141,7 +141,17 @@ public:
 
 	bool IsMatch(User* user, Channel* channel, const std::string& text) override
 	{
-		const std::string* account = accountapi.GetAccountName(user);
+		const auto* nicks = accountapi.GetAccountNicks(user);
+		if (nicks)
+		{
+			for (const auto& nick : *nicks)
+			{
+				if (InspIRCd::Match(nick, text))
+					return true;
+			}
+		}
+
+		const auto* account = accountapi.GetAccountName(user);
 		return account && InspIRCd::Match(*account, text);
 	}
 };