summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wobst <michael@wobst.at>2013-05-25 15:47:56 -0400
committerAdam <Adam@anope.org>2013-05-25 15:47:56 -0400
commit968ef349d655e36bb9f1652e3d002c49e9dc8dbe (patch)
treea50014c2cff8bf10b365a4c2a42fea2029a21eaf
parentd6640ed5eea6e82d19ebd08800edc5f90404239a (diff)
Update Hybrid protocol module for Hybrid 8.1
-rw-r--r--docs/README2
-rw-r--r--modules/protocol/hybrid.cpp12
2 files changed, 10 insertions, 4 deletions
diff --git a/docs/README b/docs/README
index 22f814aaf..cd3864d44 100644
--- a/docs/README
+++ b/docs/README
@@ -172,7 +172,7 @@ Table of Contents
* Bahamut 1.4.27 or later (including 1.8)
* Charybdis 3.4 or later
- * Hybrid 8.0 or later
+ * Hybrid 8.1 or later
* InspIRCd 1.1, 1.2, or 2.0
* ngIRCd 19.2 or later
* Plexus 3 or later
diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 1a50b89a6..afef85726 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -17,7 +17,7 @@ static Anope::string UplinkSID;
class HybridProto : public IRCDProto
{
public:
- HybridProto(Module *creator) : IRCDProto(creator, "Hybrid 8.0.0")
+ HybridProto(Module *creator) : IRCDProto(creator, "Hybrid 8.1")
{
DefaultPseudoclientModes = "+oi";
CanSVSNick = true;
@@ -41,12 +41,12 @@ class HybridProto : public IRCDProto
void SendGlobopsInternal(const BotInfo *source, const Anope::string &buf) anope_override
{
- UplinkSocket::Message(source) << "OPERWALL :" << buf;
+ UplinkSocket::Message(source) << "GLOBOPS :" << buf;
}
void SendSQLine(User *, const XLine *x) anope_override
{
- UplinkSocket::Message(OperServ) << "ENCAP * RESV " << (x->expires ? x->expires - Anope::CurTime : 0) << " " << x->mask << " 0 :" << x->reason;
+ UplinkSocket::Message(OperServ) << "RESV " << (x->expires ? x->expires - Anope::CurTime : 0) << " " << x->mask << " 0 :" << x->reason;
}
void SendSGLineDel(const XLine *x) anope_override
@@ -557,11 +557,15 @@ class ProtoHybrid : public Module
{
/* Add user modes */
ModeManager::AddUserMode(new UserMode("ADMIN", 'a'));
+ ModeManager::AddUserMode(new UserMode("CALLERID", 'g'));
ModeManager::AddUserMode(new UserMode("INVIS", 'i'));
+ ModeManager::AddUserMode(new UserMode("LOCOPS", 'l'));
ModeManager::AddUserMode(new UserMode("OPER", 'o'));
ModeManager::AddUserMode(new UserMode("REGISTERED", 'r'));
ModeManager::AddUserMode(new UserMode("SNOMASK", 's'));
ModeManager::AddUserMode(new UserMode("WALLOPS", 'w'));
+ ModeManager::AddUserMode(new UserMode("OPERWALLS", 'z'));
+ ModeManager::AddUserMode(new UserMode("DEAF", 'D'));
ModeManager::AddUserMode(new UserMode("HIDEOPER", 'H'));
ModeManager::AddUserMode(new UserMode("REGPRIV", 'R'));
@@ -580,6 +584,7 @@ class ProtoHybrid : public Module
ModeManager::AddChannelMode(new ChannelModeKey('k'));
/* Add channel modes */
+ ModeManager::AddChannelMode(new ChannelMode("BLOCKCOLOR", 'c'));
ModeManager::AddChannelMode(new ChannelMode("INVITE", 'i'));
ModeManager::AddChannelMode(new ChannelMode("MODERATED", 'm'));
ModeManager::AddChannelMode(new ChannelMode("NOEXTERNAL", 'n'));
@@ -588,6 +593,7 @@ class ProtoHybrid : public Module
ModeManager::AddChannelMode(new ChannelMode("SECRET", 's'));
ModeManager::AddChannelMode(new ChannelMode("TOPIC", 't'));
ModeManager::AddChannelMode(new ChannelModeOper('O'));
+ ModeManager::AddChannelMode(new ChannelMode("REGMODERATED", 'M'));
ModeManager::AddChannelMode(new ChannelMode("REGISTEREDONLY", 'R'));
ModeManager::AddChannelMode(new ChannelMode("SSL", 'S'));
}