From 439ad3e73657be819aa9a0bf64361a1a5150a162 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Thu, 11 Jul 2024 01:13:40 +0100
Subject: Make it clear that inspircd3 also works with InspIRCd 4.

---
 data/example.conf                  | 2 +-
 data/stats.standalone.example.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/example.conf b/data/example.conf
index 043fa4366..8237102e0 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -259,7 +259,7 @@ serverinfo
  *  - hybrid
  *  - inspircd12
  *  - inspircd20
- *  - inspircd3
+ *  - inspircd3 (for 3.x and 4.x)
  *  - ngircd
  *  - plexus
  *  - ratbox
diff --git a/data/stats.standalone.example.conf b/data/stats.standalone.example.conf
index 5aea3a6e2..63a47de83 100644
--- a/data/stats.standalone.example.conf
+++ b/data/stats.standalone.example.conf
@@ -256,7 +256,7 @@ serverinfo
  *  - hybrid
  *  - inspircd12
  *  - inspircd20
- *  - inspircd3
+ *  - inspircd3 (for 3.x and 4.x)
  *  - ngircd
  *  - plexus
  *  - ratbox
-- 
cgit 


From 41ea3465516f207e92c46f1c36decdecf197f04c Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Wed, 10 Jul 2024 18:57:37 +0100
Subject: Update the change log.

---
 docs/Changes | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/Changes b/docs/Changes
index 2c53f5bbc..0cdb2d851 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -1,6 +1,25 @@
 Anope Version 2.0.16-git
 ------------------------
-No significant changes.
+Added a workaround for users matching expired sqlines.
+Fixed a copy/paste error in webcpanel.
+Fixed a crash in db_flatfile caused by trying to serialize data without a type.
+Fixed duplicate messages when synconset/syncongroup is set.
+Fixed expiring channel suspensions.
+Fixed expiring forbids.
+Fixed expiring nick suspensions.
+Fixed feature detection on InspIRCd.
+Fixed logging users out fully when their nick gets suspended.
+Fixed marking boolean columns in SQL as TEXT instead of INT.
+Fixed matching extbans on InspIRCd and implement missing matchers.
+Fixed operserv/sqline expiry on UnrealIRCd
+Fixed respecting --noexpire in cs_suspend and ns_suspend.
+Fixed sending emails to nicks ending with a backslash.
+Fixed sending SVSTOPIC when topiclock is loaded on InspIRCd.
+Fixed some SQL tables taking up too much space on disk.
+Fixed the default config for channel suspensions.
+Fixed the TIME message on InspIRCd.
+Fixed trying to escape SQL data when not connected to MySQL.
+Fixed {ldap,sql}_authentication creating zombie accounts on expiry.
 
 Anope Version 2.0.15
 --------------------
-- 
cgit 


From 2de0dddb1c86b332b000d60dbdd81abe4f82cdb1 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Sun, 14 Jul 2024 16:38:40 +0100
Subject: Fix joining channels with keys on InspIRCd v3.

---
 docs/Changes                   | 1 +
 modules/protocol/inspircd3.cpp | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/Changes b/docs/Changes
index 0cdb2d851..e6e6a0e5f 100644
--- a/docs/Changes
+++ b/docs/Changes
@@ -8,6 +8,7 @@ Fixed expiring channel suspensions.
 Fixed expiring forbids.
 Fixed expiring nick suspensions.
 Fixed feature detection on InspIRCd.
+Fixed joining users to channels with a key set on InspIRCd.
 Fixed logging users out fully when their nick gets suspended.
 Fixed marking boolean columns in SQL as TEXT instead of INT.
 Fixed matching extbans on InspIRCd and implement missing matchers.
diff --git a/modules/protocol/inspircd3.cpp b/modules/protocol/inspircd3.cpp
index 16a6ba1d4..d3a717a3f 100644
--- a/modules/protocol/inspircd3.cpp
+++ b/modules/protocol/inspircd3.cpp
@@ -394,9 +394,12 @@ class InspIRCd3Proto : public IRCDProto
 		SendAddLine("Z", x->GetHost(), timeleft, x->by, x->GetReason());
 	}
 
-	void SendSVSJoin(const MessageSource &source, User *u, const Anope::string &chan, const Anope::string &other) anope_override
+	void SendSVSJoin(const MessageSource &source, User *u, const Anope::string &chan, const Anope::string &key) anope_override
 	{
-		UplinkSocket::Message(source) << "SVSJOIN " << u->GetUID() << " " << chan;
+		if (key.empty())
+			UplinkSocket::Message(source) << "SVSJOIN " << u->GetUID() << " " << chan;
+		else
+			UplinkSocket::Message(source) << "SVSJOIN " << u->GetUID() << " " << chan << " :" << key;
 	}
 
 	void SendSVSPart(const MessageSource &source, User *u, const Anope::string &chan, const Anope::string &param) anope_override
-- 
cgit