X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_showwhois.cpp;h=18fbd3144b0aa61c8ea1499cb47b5314fdd10cf3;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=813b35205797652030edde058250e0d75e6ed306;hpb=ece985ccb3210a132d67381511642edfb359f5c4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index 813b35205..18fbd3144 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -1,104 +1,127 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2013, 2017-2018 Sadie Powell + * Copyright (C) 2012-2015 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2010 Craig Edwards + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 . */ -#include "inspircd.h" -/* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */ +#include "inspircd.h" +#include "modules/whois.h" /** Handle user mode +W */ -class SeeWhois : public ModeHandler +class SeeWhois : public SimpleUserModeHandler { public: - SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { } + SeeWhois(Module* Creator) + : SimpleUserModeHandler(Creator, "showwhois", 'W') + { + } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + void SetOperOnly(bool operonly) { - /* Only opers can change other users modes */ - if (source != dest) - return MODEACTION_DENY; + oper = operonly; + } +}; - if (adding) - { - if (!dest->IsModeSet('W')) - { - dest->SetMode('W',true); - return MODEACTION_ALLOW; - } - } - else - { - if (dest->IsModeSet('W')) - { - dest->SetMode('W',false); - return MODEACTION_ALLOW; - } - } +class WhoisNoticeCmd : public Command +{ + public: + WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2) + { + flags_needed = FLAG_SERVERONLY; + } - return MODEACTION_DENY; + 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(User* user, const Params& parameters) CXX11_OVERRIDE + { + 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 +class ModuleShowwhois : public Module, public Whois::EventListener { - - SeeWhois* sw; + bool ShowWhoisFromOpers; + SeeWhois sw; + WhoisNoticeCmd cmd; public: - ModuleShowwhois(InspIRCd* Me) : Module(Me) + ModuleShowwhois() + : Whois::EventListener(this) + , sw(this) + , cmd(this) { - - sw = new SeeWhois(ServerInstance); - if (!ServerInstance->Modes->AddMode(sw)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnWhois }; - ServerInstance->Modules->Attach(eventlist, this, 1); } - ~ModuleShowwhois() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(sw); - delete sw; - } + ConfigTag* tag = ServerInstance->Config->ConfValue("showwhois"); + sw.SetOperOnly(tag->getBool("opersonly", true)); + ShowWhoisFromOpers = tag->getBool("showfromopers", true); + } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Adds user mode W (showwhois) which allows users to be informed when someone does a /WHOIS query on their nick.", VF_OPTCOMMON|VF_VENDOR); } - virtual void OnWhois(User* source, User* dest) + void OnWhois(Whois::Context& whois) CXX11_OVERRIDE { - if ((dest->IsModeSet('W')) && (source != dest)) + 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)) { - if (IS_LOCAL(dest)) - { - dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host); - } - else - { - std::deque params; - params.push_back(dest->nick); - std::string msg = ":"; - msg = msg + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you."; - params.push_back(msg); - Event ev((char *) ¶ms, NULL, "send_push"); - ev.Send(ServerInstance); - } + cmd.HandleFast(dest, source); + } + else + { + CommandBase::Params params; + params.push_back(dest->uuid); + params.push_back(source->uuid); + ServerInstance->PI->SendEncapsulatedData(dest->server->GetName(), cmd.name, params); } } - }; MODULE_INIT(ModuleShowwhois)