From 6597fe5d4fd2c1cc474fa35a0db21fec480ff47f Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Wed, 29 Jan 2020 11:44:50 +0000 Subject: Add Channel::WriteRemoteNotice and revert WriteNotice changes. This is a partial reversion of 687778b72e. See also: #1749. --- src/modules/m_spanningtree/fjoin.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/modules/m_spanningtree') diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp index 750c33d42..4ca09da5e 100644 --- a/src/modules/m_spanningtree/fjoin.cpp +++ b/src/modules/m_spanningtree/fjoin.cpp @@ -279,11 +279,9 @@ void CommandFJoin::LowerTS(Channel* chan, time_t TS, const std::string& newname) { if (Utils->AnnounceTSChange) { - // WriteNotice is not used here because the message only needs to go to the local server. - const std::string tsmessage = InspIRCd::Format("Creation time of %s changed from %s to %s", newname.c_str(), - InspIRCd::TimeString(chan->age).c_str(), InspIRCd::TimeString(TS).c_str()); - ClientProtocol::Messages::Privmsg privmsg(ClientProtocol::Messages::Privmsg::nocopy, ServerInstance->FakeClient, chan, tsmessage, MSG_NOTICE); - chan->Write(ServerInstance->GetRFCEvents().privmsg, privmsg); + // WriteRemoteNotice is not used here because the message only needs to go to the local server. + chan->WriteNotice(InspIRCd::Format("Creation time of %s changed from %s to %s", newname.c_str(), + InspIRCd::TimeString(chan->age).c_str(), InspIRCd::TimeString(TS).c_str())); } // While the name is equal in case-insensitive compare, it might differ in case; use the remote version -- cgit v1.2.3