diff options
author | Attila Molnar <attilamolnar@hush.com> | 2016-02-26 15:40:22 +0100 |
---|---|---|
committer | Attila Molnar <attilamolnar@hush.com> | 2016-02-26 15:40:22 +0100 |
commit | a5c00b1548d7c8fc89358c26901fa534f7836cc1 (patch) | |
tree | f309797539a83a355a1c06b6c522f3ee0c46ccc1 /src/modules/m_namesx.cpp | |
parent | 42b7f65a06e9307bf18deff2837535730b895d4a (diff) |
Return ModResult from the OnSendWhoLine hook
Diffstat (limited to 'src/modules/m_namesx.cpp')
-rw-r--r-- | src/modules/m_namesx.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index c906322bf..14f89807f 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -67,21 +67,21 @@ class ModuleNamesX : public Module return MOD_RES_PASSTHRU; } - void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE + ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE { if ((!memb) || (!cap.get(source))) - return; + return MOD_RES_PASSTHRU; // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is // only ever valid after whitespace, so... find the actual delimiter first! // Thanks to FxChiP for pointing this out. std::string::size_type pos = line.find(" :"); if (pos == std::string::npos || pos == 0) - return; + return MOD_RES_PASSTHRU; pos--; // Don't do anything if the user has no prefixes if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*')) - return; + return MOD_RES_PASSTHRU; // 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a // pos @@ -89,10 +89,11 @@ class ModuleNamesX : public Module // Don't do anything if the user has only one prefix std::string prefixes = memb->GetAllPrefixChars(); if (prefixes.length() <= 1) - return; + return MOD_RES_PASSTHRU; line.erase(pos, 1); line.insert(pos, prefixes); + return MOD_RES_PASSTHRU; } }; |