diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2014-02-14 12:00:06 +0100 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-02-14 12:00:06 +0100 |
| commit | 51b5f06c48b98a256eb56ea5f7e4d5d170555e84 (patch) | |
| tree | ccc93b4b9fc7c273f7ddfb9c44b6ddc1dec2e91a /src/modules | |
| parent | 3111038011b7414c5068563b2abe834267a368ad (diff) | |
Return a Membership* from get_first_visible_channel() in cmd_who and pass that to modules
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/m_auditorium.cpp | 5 | ||||
| -rw-r--r-- | src/modules/m_hideoper.cpp | 2 | ||||
| -rw-r--r-- | src/modules/m_namesx.cpp | 6 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index 21afcabad..8ec80ef46 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -152,11 +152,10 @@ class ModuleAuditorium : public Module } } - void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Channel* channel, std::string& line) CXX11_OVERRIDE + void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE { - if (!channel) + if (!memb) return; - Membership* memb = channel->GetUser(user); if (IsVisible(memb)) return; if (CanSee(source, memb)) diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp index de4a27cae..d3c2bf444 100644 --- a/src/modules/m_hideoper.cpp +++ b/src/modules/m_hideoper.cpp @@ -63,7 +63,7 @@ class ModuleHideOper : public Module return MOD_RES_PASSTHRU; } - void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Channel* chan, std::string& line) CXX11_OVERRIDE + void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE { if (user->IsModeSet(hm) && !source->HasPrivPermission("users/auspex")) { diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index 2e2060032..820963d5b 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -71,9 +71,9 @@ class ModuleNamesX : public Module prefixes = memb->chan->GetAllPrefixChars(memb->user); } - void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Channel* chan, std::string& line) CXX11_OVERRIDE + void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE { - if ((!chan) || (!cap.ext.get(source))) + if ((!memb) || (!cap.ext.get(source))) return; // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is @@ -91,7 +91,7 @@ class ModuleNamesX : public Module // pos // Don't do anything if the user has only one prefix - std::string prefixes = chan->GetAllPrefixChars(user); + std::string prefixes = memb->chan->GetAllPrefixChars(memb->user); if (prefixes.length() <= 1) return; |