diff options
author | Sadie Powell <sadie@witchery.services> | 2024-03-11 22:43:29 +0000 |
---|---|---|
committer | Sadie Powell <sadie@witchery.services> | 2024-03-11 22:43:29 +0000 |
commit | 77435dd0d9642837758db74f28ca19fba9a2a4bb (patch) | |
tree | 04d1873fb4aed95deef54c3795c78f51a9d79edf /modules | |
parent | 7c1cfd2849381bb74b60499d10668533981a9127 (diff) | |
parent | 6f57907416de70b80e318df6ce913df679c27188 (diff) |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/protocol/inspircd.cpp | 15 | ||||
-rw-r--r-- | modules/protocol/unrealircd.cpp | 2 |
2 files changed, 3 insertions, 14 deletions
diff --git a/modules/protocol/inspircd.cpp b/modules/protocol/inspircd.cpp index 1d26c6d9b..191ea5368 100644 --- a/modules/protocol/inspircd.cpp +++ b/modules/protocol/inspircd.cpp @@ -2304,17 +2304,6 @@ struct IRCDMessageSQuit final } }; -struct IRCDMessageTime final - : IRCDMessage -{ - IRCDMessageTime(Module *creator) : IRCDMessage(creator, "TIME", 2) { } - - void Run(MessageSource &source, const std::vector<Anope::string> ¶ms, const Anope::map<Anope::string> &tags) override - { - Uplink::Send("TIME", source.GetSource(), params[1], Anope::CurTime); - } -}; - struct IRCDMessageUID final : IRCDMessage { @@ -2383,6 +2372,7 @@ class ProtoInspIRCd final Message::Quit message_quit; Message::Privmsg message_squery; Message::Stats message_stats; + Message::Time message_time; /* Our message handlers */ IRCDMessageAway message_away; @@ -2407,7 +2397,6 @@ class ProtoInspIRCd final IRCDMessageSave message_save; IRCDMessageServer message_server; IRCDMessageSQuit message_squit; - IRCDMessageTime message_time; IRCDMessageUID message_uid; bool use_server_side_topiclock, use_server_side_mlock; @@ -2431,6 +2420,7 @@ public: , message_quit(this) , message_squery(this, "SQUERY") , message_stats(this) + , message_time(this) , message_away(this) , message_capab(this) , message_encap(this) @@ -2453,7 +2443,6 @@ public: , message_save(this) , message_server(this) , message_squit(this) - , message_time(this) , message_uid(this) { } diff --git a/modules/protocol/unrealircd.cpp b/modules/protocol/unrealircd.cpp index d1d852d37..146d0237b 100644 --- a/modules/protocol/unrealircd.cpp +++ b/modules/protocol/unrealircd.cpp @@ -194,7 +194,7 @@ private: */ void SendSQLine(User *, const XLine *x) override { - Uplink::Send("SQLINE", x->mask, x->GetReason()); + Uplink::Send("TKL", '+', 'Q', "*", x->mask, x->by, x->expires, x->created, x->GetReason()); } /* Functions that use serval cmd functions */ |