From c0bc5bf7981e30229bdabfdf51a289635fe8be76 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Sat, 16 Apr 2022 11:48:08 +0100
Subject: Add ListModeBase::CanonicalizeParam, fix cleaning extban masks.

---
 src/modules/m_inviteexception.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/modules/m_inviteexception.cpp')

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 565bb4bf9..8db100230 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -24,6 +24,7 @@
 
 #include "inspircd.h"
 #include "listmode.h"
+#include "modules/extban.h"
 #include "modules/isupport.h"
 
 enum
@@ -36,12 +37,23 @@ enum
 class InviteException final
 	: public ListModeBase
 {
+private:
+	ExtBan::ManagerRef extbanmgr;
+
 public:
 	InviteException(Module* Creator)
-		: ListModeBase(Creator, "invex", 'I', RPL_INVEXLIST, RPL_ENDOFINVEXLIST, true)
+		: ListModeBase(Creator, "invex", 'I', RPL_INVEXLIST, RPL_ENDOFINVEXLIST)
+		, extbanmgr(Creator)
 	{
 		syntax = "<mask>";
 	}
+
+	bool CanonicalizeParam(LocalUser* user, Channel* channel, std::string& parameter) override
+	{
+		if (!extbanmgr || !extbanmgr->Canonicalize(parameter))
+			ModeParser::CleanMask(parameter);
+		return true;
+	}
 };
 
 class ModuleInviteException final
-- 
cgit v1.3.1-10-gc9f91