adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 01:13:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.7.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2018-06-04 22:30:53 +01:00
parent add1316517 d15e619483
commit fda73d8c81
12 changed files with 145 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Client.cpp
+5 -5
View File
@@ -1204,7 +1204,7 @@ bool CClient::OnPingMessage(CMessage& Message) {
// All PONGs are generated by ZNC. We will still forward this to
// the ircd, but all PONGs from irc will be blocked.
if (!Message.GetParams().empty())
PutClient(":irc.znc.in PONG irc.znc.in " + Message.GetParams(0));
PutClient(":irc.znc.in PONG irc.znc.in " + Message.GetParamsColon(0));
else
PutClient(":irc.znc.in PONG irc.znc.in");
return false;
@@ -1305,10 +1305,10 @@ bool CClient::OnOtherMessage(CMessage& Message) {
CString sModCommand;
if (sTarget.TrimPrefix(m_pUser->GetStatusPrefix())) {
sModCommand = Message.GetParams(1);
sModCommand = Message.GetParamsColon(1);
} else {
sTarget = "status";
sModCommand = Message.GetParams(0);
sModCommand = Message.GetParamsColon(0);
}
if (sTarget.Equals("status")) {
@@ -1330,7 +1330,7 @@ bool CClient::OnOtherMessage(CMessage& Message) {
return true;
}
CString sPatterns = Message.GetParams(0);
CString sPatterns = Message.GetParamsColon(0);
if (sPatterns.empty()) {
PutStatusNotice(t_s("Usage: /attach <#chans>"));
@@ -1352,7 +1352,7 @@ bool CClient::OnOtherMessage(CMessage& Message) {
return true;
}
CString sPatterns = Message.GetParams(0);
CString sPatterns = Message.GetParamsColon(0);
if (sPatterns.empty()) {
PutStatusNotice(t_s("Usage: /detach <#chans>"));
src/IRCSock.cpp
+1 -1
View File
@@ -761,7 +761,7 @@ bool CIRCSock::OnNumericMessage(CNumericMessage& Message) {
CChan* pChan = m_pNetwork->FindChan(Message.GetParam(1));
if (pChan) {
pChan->SetModes(Message.GetParams(2));
pChan->SetModes(Message.GetParamsColon(2));
// We don't SetModeKnown(true) here,
// because a 329 will follow
src/Message.cpp
+2 -2
View File
@@ -48,7 +48,7 @@ void CMessage::SetCommand(const CString& sCommand) {
InitType();
}
CString CMessage::GetParams(unsigned int uIdx, unsigned int uLen) const {
CString CMessage::GetParamsColon(unsigned int uIdx, unsigned int uLen) const {
if (m_vsParams.empty() || uLen == 0) {
return "";
}
@@ -151,7 +151,7 @@ CString CMessage::ToString(unsigned int uFlags) const {
if (!sMessage.empty()) {
sMessage += " ";
}
sMessage += GetParams(0);
sMessage += GetParamsColon(0);
}
return sMessage;