diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-12-07 17:48:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-07 17:48:38 +0100 |
| commit | 4b8f3dd68f7c3a273c1a892c0de54ea01e48db3e (patch) | |
| tree | a14f45f6ea3c9dc8bd9aa5b16b891daee10e71ca | |
| parent | c165759fbe0dc1c1632cd5369dd1550f28f45a3b (diff) | |
| parent | d494c188245e1c80c9556a6a7efafd6fe8f4f6de (diff) | |
Merge pull request #1254 from genius3000/insp20+fixPIstatusmsgs
Fix spanningtree protocol interface sending statusmsgs to whole channel
| -rw-r--r-- | src/modules/m_spanningtree/protocolinterface.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/modules/m_spanningtree/protocolinterface.cpp b/src/modules/m_spanningtree/protocolinterface.cpp index 3ab5dae9d..ca4147fea 100644 --- a/src/modules/m_spanningtree/protocolinterface.cpp +++ b/src/modules/m_spanningtree/protocolinterface.cpp @@ -137,9 +137,6 @@ void SpanningTreeProtocolInterface::PushToClient(User* target, const std::string void SpanningTreeProtocolInterface::SendChannel(Channel* target, char status, const std::string &text) { - std::string cname = target->name; - if (status) - cname = status + cname; TreeServerList list; CUList exempt_list; Utils->GetListOfServersForChannel(target,list,status,exempt_list); @@ -154,12 +151,20 @@ void SpanningTreeProtocolInterface::SendChannel(Channel* target, char status, co void SpanningTreeProtocolInterface::SendChannelPrivmsg(Channel* target, char status, const std::string &text) { - SendChannel(target, status, ":" + ServerInstance->Config->GetSID()+" PRIVMSG "+target->name+" :"+text); + std::string cname = target->name; + if (status) + cname.insert(0, 1, status); + + SendChannel(target, status, ":" + ServerInstance->Config->GetSID()+" PRIVMSG "+cname+" :"+text); } void SpanningTreeProtocolInterface::SendChannelNotice(Channel* target, char status, const std::string &text) { - SendChannel(target, status, ":" + ServerInstance->Config->GetSID()+" NOTICE "+target->name+" :"+text); + std::string cname = target->name; + if (status) + cname.insert(0, 1, status); + + SendChannel(target, status, ":" + ServerInstance->Config->GetSID()+" NOTICE "+cname+" :"+text); } void SpanningTreeProtocolInterface::SendUserPrivmsg(User* target, const std::string &text) |