Move SetNoticeMask(), FormatNoticeMasks() and ProcessNoticeMasks() from the User...

[user/henk/code/inspircd.git] / src / commands / cmd_whois.cpp

diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index 4893c125170d976dc96c5ca2651533ab6c6cff1f..116e4313555ffc3b16d03648e102a3b45ceb4b13 100644 (file)
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -30,6 +30,7 @@ class CommandWhois : public SplitCommand
 {
        ChanModeReference secretmode;
        ChanModeReference privatemode;
+       UserModeReference snomaskmode;
 
        void SplitChanList(User* source, User* dest, const std::string& cl);
        void DoWhois(User* user, User* dest, unsigned long signon, unsigned long idle);
@@ -42,6 +43,7 @@ class CommandWhois : public SplitCommand
                : SplitCommand(parent, "WHOIS", 1)
                , secretmode(parent, "secret")
                , privatemode(parent, "private")
+               , snomaskmode(parent, "snomask")
        {
                Penalty = 2;
                syntax = "<nick>{,<nick>}";
@@ -161,9 +163,9 @@ void CommandWhois::DoWhois(User* user, User* dest, unsigned long signon, unsigne
 
        if (user == dest || user->HasPrivPermission("users/auspex"))
        {
-               if (dest->IsModeSet('s') != 0)
+               if (dest->IsModeSet(snomaskmode))
                {
-                       ServerInstance->SendWhoisLine(user, dest, 379, "%s %s :is using modes +%s +%s", user->nick.c_str(), dest->nick.c_str(), dest->FormatModes(), dest->FormatNoticeMasks().c_str());
+                       ServerInstance->SendWhoisLine(user, dest, 379, "%s %s :is using modes +%s %s", user->nick.c_str(), dest->nick.c_str(), dest->FormatModes(), snomaskmode->GetUserParameter(dest).c_str());
                }
                else
                {