iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-06 21:42:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename new On...Message modules callbacks to be more consistent.

Browse Source 
OnPrivMessage -> OnPrivTextMessage
OnChanMessage -> OnChanTextMessage

Fix #1191
This commit is contained in:
Alexey Sokolov
2016-12-25 15:46:22 +00:00
parent 30cd0584a1
commit c803a85e13
10 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/ModulesTest.cpp
View File

@@ -208,14 +208,14 @@ class CMessageModule : public CModule {
Message.SetText("CMessageModule::OnChanActionMessage");
return eAction;
}
EModRet OnPrivMessage(CTextMessage& Message) override {
EModRet OnPrivTextMessage(CTextMessage& Message) override {
Message.GetNick().SetNick("nick");
Message.SetText("CMessageModule::OnPrivMessage");
Message.SetText("CMessageModule::OnPrivTextMessage");
return eAction;
}
EModRet OnChanMessage(CTextMessage& Message) override {
EModRet OnChanTextMessage(CTextMessage& Message) override {
Message.GetNick().SetNick("nick");
Message.SetText("CMessageModule::OnChanMessage");
Message.SetText("CMessageModule::OnChanTextMessage");
return eAction;
}
EModRet OnPrivNoticeMessage(CNoticeMessage& Message) override {
@@ -392,23 +392,23 @@ TEST_F(ModulesTest, Hooks) {
CTextMessage PrivMsg;
LegacyMod.eAction = CModule::HALT;
Modules.OnPrivMessage(PrivMsg);
Modules.OnPrivTextMessage(PrivMsg);
EXPECT_EQ("legacy", PrivMsg.GetNick().GetNick());
EXPECT_EQ("CLegacyModule::OnPrivMsg", PrivMsg.GetText());
LegacyMod.eAction = CModule::CONTINUE;
Modules.OnPrivMessage(PrivMsg);
Modules.OnPrivTextMessage(PrivMsg);
EXPECT_EQ("nick", PrivMsg.GetNick().GetNick());
EXPECT_EQ("CMessageModule::OnPrivMessage", PrivMsg.GetText());
EXPECT_EQ("CMessageModule::OnPrivTextMessage", PrivMsg.GetText());
CTextMessage ChanMsg;
LegacyMod.eAction = CModule::HALT;
Modules.OnChanMessage(ChanMsg);
Modules.OnChanTextMessage(ChanMsg);
EXPECT_EQ("legacy", ChanMsg.GetNick().GetNick());
EXPECT_EQ("CLegacyModule::OnChanMsg", ChanMsg.GetText());
LegacyMod.eAction = CModule::CONTINUE;
Modules.OnChanMessage(ChanMsg);
Modules.OnChanTextMessage(ChanMsg);
EXPECT_EQ("nick", ChanMsg.GetNick().GetNick());
EXPECT_EQ("CMessageModule::OnChanMessage", ChanMsg.GetText());
EXPECT_EQ("CMessageModule::OnChanTextMessage", ChanMsg.GetText());
CNoticeMessage PrivNotice;
LegacyMod.eAction = CModule::HALT;