Flexible SendQ

[user/henk/code/inspircd.git] / src / modules / m_showwhois.cpp

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 5be7c2614836b86834b26f8b738f6d8b02ed401c..9acc019aadc1cc62eeee8ed86ef6d3e29f8dc965 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,9 +20,12 @@
 class SeeWhois : public ModeHandler
 {
  public:
-       SeeWhois(InspIRCd* Instance, bool IsOpersOnly) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, IsOpersOnly) { }
+       SeeWhois(Module* Creator, bool IsOpersOnly) : ModeHandler(Creator, 'W', PARAM_NONE, MODETYPE_USER)
+       {
+               oper = IsOpersOnly;
+       }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -45,22 +48,49 @@ class SeeWhois : public ModeHandler
        }
 };
 
+class WhoisNoticeCmd : public Command
+{
+ public:
+       WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
+       {
+       }
+
+       void HandleFast(User* dest, User* src)
+       {
+               dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you",
+                       dest->nick.c_str(), src->nick.c_str(), src->ident.c_str(),
+                       dest->HasPrivPermission("users/auspex") ? src->host.c_str() : src->dhost.c_str());
+       }
+
+       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+       {
+               User* dest = ServerInstance->FindNick(parameters[0]);
+
+               if (IS_LOCAL(dest))
+                       HandleFast(dest, user);
+
+               return CMD_SUCCESS;
+       }
+};
+
 class ModuleShowwhois : public Module
 {
        bool ShowWhoisFromOpers;
        SeeWhois* sw;
+       WhoisNoticeCmd cmd;
 
  public:
 
-       ModuleShowwhois(InspIRCd* Me) : Module(Me)
+       ModuleShowwhois() : cmd(this)
        {
-               ConfigReader conf(ServerInstance);
+               ConfigReader conf;
                bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
                ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
 
-               sw = new SeeWhois(ServerInstance, OpersOnly);
+               sw = new SeeWhois(this, OpersOnly);
                if (!ServerInstance->Modes->AddMode(sw))
                        throw ModuleException("Could not add new modes!");
+               ServerInstance->AddCommand(&cmd);
                Implementation eventlist[] = { I_OnWhois };
                ServerInstance->Modules->Attach(eventlist, this, 1);
        }
@@ -73,39 +103,28 @@ class ModuleShowwhois : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
        virtual void OnWhois(User* source, User* dest)
        {
-               if ((dest->IsModeSet('W')) && (source != dest))
-               {
-                       if (!ShowWhoisFromOpers && IS_OPER(source))
-                               return;
-
-                       std::string wmsg = "*** ";
-                       wmsg += source->nick + "(" + source->ident + "@";
-
-                       if (dest->HasPrivPermission("users/auspex"))
-                       {
-                               wmsg += source->host;
-                       }
-                       else
-                       {
-                               wmsg += source->dhost;
-                       }
+               if (!dest->IsModeSet('W') || source == dest)
+                       return;
 
-                       wmsg += ") did a /whois on you";
+               if (!ShowWhoisFromOpers && (IS_OPER(source) != IS_OPER(dest)))
+                       return;
 
-                       if (IS_LOCAL(dest))
-                       {
-                               dest->WriteServ("NOTICE %s :%s", dest->nick.c_str(), wmsg.c_str());
-                       }
-                       else
-                       {
-                               std::string msg = std::string(":") + dest->server + " NOTICE " + dest->nick + " :" + wmsg;
-                               ServerInstance->PI->PushToClient(dest, msg);
-                       }
+               if (IS_LOCAL(dest))
+               {
+                       cmd.HandleFast(dest, source);
+               }
+               else
+               {
+                       std::vector<std::string> params;
+                       params.push_back(dest->server);
+                       params.push_back("WHOISNOTICE");
+                       params.push_back(dest->uuid);
+                       ServerInstance->PI->SendEncapsulatedData(params);
                }
        }