adam/znc
1
0 Fork 0
mirror of https://github.com/znc/znc.git synced 2026-10-30 17:21:59 +01:00
Code Issues 362 Packages Projects Releases Wiki Activity

clearbufferonmsg: Modernize and add test.

Browse Source
This commit is contained in:
RealKindOne authored and Alexey Sokolov committed 2026-09-13 11:27:31 +01:00
1 parent 28b9d8cbfb
commit 2a2b6068e8
2 files changed
+105 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/clearbufferonmsg.cpp
+7 -7
View File
@@ -68,37 +68,37 @@ class CClearBufferOnMsgMod : public CModule {
}
}
EModRet OnUserMsg(CString& sTarget, CString& sMessage) override {
EModRet OnUserTextMessage(CTextMessage& Message) override {
if (m_bRules[RULE_MSG]) ClearAllBuffers();
return CONTINUE;
}
EModRet OnUserCTCP(CString& sTarget, CString& sMessage) override {
EModRet OnUserCTCPMessage(CCTCPMessage& Message) override {
if (m_bRules[RULE_CTCP]) ClearAllBuffers();
return CONTINUE;
}
EModRet OnUserAction(CString& sTarget, CString& sMessage) override {
EModRet OnUserActionMessage(CActionMessage& Message) override {
if (m_bRules[RULE_ACTION]) ClearAllBuffers();
return CONTINUE;
}
EModRet OnUserNotice(CString& sTarget, CString& sMessage) override {
EModRet OnUserNoticeMessage(CNoticeMessage& Message) override {
if (m_bRules[RULE_NOTICE]) ClearAllBuffers();
return CONTINUE;
}
EModRet OnUserPart(CString& sChannel, CString& sMessage) override {
EModRet OnUserPartMessage(CPartMessage& Message) override {
if (m_bRules[RULE_PART]) ClearAllBuffers();
return CONTINUE;
}
EModRet OnUserTopic(CString& sChannel, CString& sTopic) override {
EModRet OnUserTopicMessage(CTopicMessage& Message) override {
if (m_bRules[RULE_TOPIC]) ClearAllBuffers();
return CONTINUE;
}
EModRet OnUserQuit(CString& sMessage) override {
EModRet OnUserQuitMessage(CQuitMessage& Message) override {
if (m_bRules[RULE_QUIT]) ClearAllBuffers();
return CONTINUE;
}
test/integration/tests/modules.cpp
+98
View File
@@ -699,5 +699,103 @@ TEST_F(ZNCTest, ChanSaverModule) {
client.ReadUntil("No channels matching [#test] found");
}
TEST_F(ZNCTest, ClearBufferOnMsgModule) {
auto znc = Run();
auto ircd = ConnectIRCd();
auto client = LoginClient();
client.Write("znc loadmod clearbufferonmsg");
client.ReadUntil("Loaded module");
ircd.Write(":server 001 nick :Hello");
ircd.Write(":nick JOIN :#test");
ircd.Write(":server 353 nick = #test :nick someone");
ircd.Write(":server 366 nick #test :End of /NAMES list");
client.ReadUntil("End of /NAMES");
// OnUserTextMessage
ircd.Write(":someone!user@host PRIVMSG #test :testing - OnUserTextMessage");
client.ReadUntil("testing - OnUserTextMessage");
client.Write("PRIVMSG #test :test");
ircd.ReadUntil("PRIVMSG");
client.Write("DETACH #test");
client.ReadUntil("Detached");
client.Write("ATTACH #test");
client.ReadUntil("End of /NAMES list");
QByteArray remainder = client.ReadRemainder();
EXPECT_THAT(remainder, Not(HasSubstr("OnUserTextMessage")))
<< "OnUserTextMessage failed to clear buffer";
// OnUserActionMessage
ircd.Write(":someone!user@host PRIVMSG #test :testing - OnUserActionMessage");
client.ReadUntil("testing - OnUserActionMessage");
client.Write("PRIVMSG #test :\001ACTION testing\001");
ircd.ReadUntil("PRIVMSG");
client.Write("DETACH #test");
client.ReadUntil("Detached");
client.Write("ATTACH #test");
client.ReadUntil("End of /NAMES list");
remainder = client.ReadRemainder();
EXPECT_THAT(remainder, Not(HasSubstr("OnUserActionMessage")))
<< "OnUserActionMessage failed to clear buffer";
// OnUserCTCPMessage
ircd.Write(":someone!user@host PRIVMSG #test :testing - OnUserCTCPMessage");
client.ReadUntil("testing - OnUserCTCPMessage");
client.Write("PRIVMSG #test :\001VERSION\001");
ircd.ReadUntil("PRIVMSG");
client.Write("DETACH #test");
client.ReadUntil("Detached");
client.Write("ATTACH #test");
client.ReadUntil("End of /NAMES list");
remainder = client.ReadRemainder();
EXPECT_THAT(remainder, Not(HasSubstr("OnUserCTCPMessage")))
<< "OnUserCTCPMessage failed to clear buffer";
// OnUserNoticeMessage
ircd.Write(":someone!user@host PRIVMSG #test :testing - OnUserNoticeMessage");
client.ReadUntil("testing - OnUserNoticeMessage");
client.Write("NOTICE #test :testing");
ircd.ReadUntil("NOTICE");
client.Write("DETACH #test");
client.ReadUntil("Detached");
client.Write("ATTACH #test");
client.ReadUntil("End of /NAMES list");
remainder = client.ReadRemainder();
EXPECT_THAT(remainder, Not(HasSubstr("OnUserNoticeMessage")))
<< "OnUserNoticeMessage failed to clear buffer";
// OnUserPartMessage
ircd.Write(":someone!user@host PRIVMSG #test :testing - OnUserPartMessage");
client.ReadUntil("testing - OnUserPartMessage");
client.Write("PART #test :testing");
ircd.ReadUntil("PART");
client.Write("JOIN #test");
ircd.ReadUntil("JOIN");
ircd.Write(":server 353 nick = #test :nick someone");
ircd.Write(":server 366 nick #test :End of /NAMES list");
client.ReadUntil("End of /NAMES");
client.Write("DETACH #test");
client.ReadUntil("Detached");
client.Write("ATTACH #test");
client.ReadUntil("End of /NAMES list");
remainder = client.ReadRemainder();
EXPECT_THAT(remainder, Not(HasSubstr("OnUserPartMessage")))
<< "OnUserPartMessage failed to clear buffer";
// OnUserTopicMessage
ircd.Write(":someone!user@host PRIVMSG #test :testing - OnUserTopicMessage");
client.ReadUntil("testing - OnUserTopicMessage");
client.Write("TOPIC #test :testing");
ircd.ReadUntil("TOPIC");
client.Write("DETACH #test");
client.ReadUntil("Detached");
client.Write("ATTACH #test");
client.ReadUntil("End of /NAMES list");
remainder = client.ReadRemainder();
EXPECT_THAT(remainder, Not(HasSubstr("OnUserTopicMessage")))
<< "OnUserTopicMessage failed to clear buffer";
}
} // namespace
} // namespace znc_inttest