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

Merge branch '1.8.x'

Browse Source
This commit is contained in:
Alexey Sokolov
2020-05-31 11:49:10 +01:00
parent 9ea9d30845 6cce5fe08d
commit dff01490ca
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -1
View File
@@ -1,4 +1,4 @@
FROM alpine:3.10
FROM alpine:3.11
ARG VERSION_EXTRA=""
src/Client.cpp
+7 -1
View File
@@ -862,6 +862,9 @@ void CClient::ClearServerDependentCaps() {
template <typename T>
void CClient::AddBuffer(const T& Message) {
if (!m_pNetwork) {
return;
}
const CString sTarget = Message.GetTarget();
T Format;
@@ -889,7 +892,7 @@ void CClient::EchoMessage(const CMessage& Message) {
CMessage EchoedMessage = Message;
for (CClient* pClient : GetClients()) {
if (pClient->HasEchoMessage() ||
(pClient != this && (m_pNetwork->IsChan(Message.GetParam(0)) ||
(pClient != this && ((m_pNetwork && m_pNetwork->IsChan(Message.GetParam(0))) ||
pClient->HasSelfMessage()))) {
EchoedMessage.SetNick(GetNickMask());
pClient->PutClient(EchoedMessage);
@@ -898,6 +901,9 @@ void CClient::EchoMessage(const CMessage& Message) {
}
set<CChan*> CClient::MatchChans(const CString& sPatterns) const {
if (!m_pNetwork) {
return {};
}
VCString vsPatterns;
sPatterns.Replace_n(",", " ")
.Split(" ", vsPatterns, false, "", "", true, true);
test/integration/tests/core.cpp
+8
View File
@@ -297,6 +297,14 @@ TEST_F(ZNCTest, StatusEchoMessage) {
client.Write("PRIVMSG *status :blah");
client.ReadUntil(":nick!user@irc.znc.in PRIVMSG *status :blah");
client.ReadUntil(":*status!znc@znc.in PRIVMSG nick :Unknown command");
client.Write("znc delnetwork test");
client.ReadUntil("Network deleted");
auto client2 = LoginClient();
client2.Write("PRIVMSG *status :blah2");
client2.ReadUntil(":*status!znc@znc.in PRIVMSG nick :Unknown command");
auto client3 = LoginClient();
client3.Write("PRIVMSG *status :blah3");
client3.ReadUntil(":*status!znc@znc.in PRIVMSG nick :Unknown command");
}
} // namespace