summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/Changes1
-rw-r--r--modules/protocol/inspircd3.cpp7
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