Hide User#host and User#dhost and use accessors to modify them.

[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 b7642a012b6de556fa4b719a08537b20c6852c1f..99774563d3d827a7b7612210afb8eb8962c7e87d 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,85 +1,124 @@
-using namespace std;
-
-// showwhois module by typobox43
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-
-/* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
-
-Server *Srv;
-
-class ModuleShowwhois : public Module {
-
-       public:
-
-               ModuleShowwhois() {
-
-                       Srv = new Server;
-
-                       Srv->AddExtendedMode('W',MT_CLIENT,true,0,0);
-
-               }
-
-               ~ModuleShowwhois() {
-
-                       delete Srv;
-
-               }
-
-               virtual Version GetVersion()
-               {
-                       return Version(1,0,0,3,VF_STATIC);
-               }
-
-               virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list& params) {
-
-                       if((type == MT_CLIENT) && (modechar == 'W')) {
-
-                               return 1;
-
-                       }
-
-                       return 0;
-
-               }
-
-               virtual void OnWhois(userrec* source, userrec* dest) {
-
-                       if(strchr(dest->modes,'W')) {
-
-                               WriteServ(dest->fd,"NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
-                               
-                       }
-
-               }
-
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2005, 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2004 Christopher Hall <typobox43@gmail.com>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+
+/** Handle user mode +W
+ */
+class SeeWhois : public SimpleUserModeHandler
+{
+ public:
+       SeeWhois(Module* Creator)
+               : SimpleUserModeHandler(Creator, "showwhois", 'W')
+       {
+       }
+
+       void SetOperOnly(bool operonly)
+       {
+               oper = operonly;
+       }
 };
 
-class ModuleShowwhoisFactory : public ModuleFactory {
-
-       public:
-
-               ModuleShowwhoisFactory() {
-
-               }
-
-               ~ModuleShowwhoisFactory() {
+class WhoisNoticeCmd : public Command
+{
+ public:
+       WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2)
+       {
+               flags_needed = FLAG_SERVERONLY;
+       }
+
+       void HandleFast(User* dest, User* src)
+       {
+               dest->WriteNotice("*** " + src->nick + " (" + src->ident + "@" +
+                       src->GetHost(dest->HasPrivPermission("users/auspex")) + 
+                       ") did a /whois on you");
+       }
+
+       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+       {
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               if (!dest)
+                       return CMD_FAILURE;
+
+               User* source = ServerInstance->FindNick(parameters[1]);
+
+               if (IS_LOCAL(dest) && source)
+                       HandleFast(dest, source);
+
+               return CMD_SUCCESS;
+       }
+};
 
+class ModuleShowwhois : public Module, public Whois::EventListener
+{
+       bool ShowWhoisFromOpers;
+       SeeWhois sw;
+       WhoisNoticeCmd cmd;
+
+ public:
+
+       ModuleShowwhois()
+               : Whois::EventListener(this)
+               , sw(this)
+               , cmd(this)
+       {
+       }
+
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois");
+
+               sw.SetOperOnly(tag->getBool("opersonly", true));
+               ShowWhoisFromOpers = tag->getBool("showfromopers", true);
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR);
+       }
+
+       void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
+       {
+               User* const source = whois.GetSource();
+               User* const dest = whois.GetTarget();
+               if (!dest->IsModeSet(sw) || whois.IsSelfWhois())
+                       return;
+
+               if (!ShowWhoisFromOpers && source->IsOper())
+                       return;
+
+               if (IS_LOCAL(dest))
+               {
+                       cmd.HandleFast(dest, source);
                }
-
-               virtual Module* CreateModule() {
-
-                       return new ModuleShowwhois;
-
+               else
+               {
+                       std::vector<std::string> params;
+                       params.push_back(dest->uuid);
+                       params.push_back(source->uuid);
+                       ServerInstance->PI->SendEncapsulatedData(dest->server->GetName(), cmd.name, params);
                }
-
+       }
 };
 
-extern "C" void* init_module() {
-
-       return new ModuleShowwhoisFactory;
-
-}
+MODULE_INIT(ModuleShowwhois)