-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 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 <http://www.gnu.org/licenses/>.
*/
-#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(Module* Creator, bool IsOpersOnly) : ModeHandler(Creator, "showwhois", 'W', PARAM_NONE, MODETYPE_USER)
+ SeeWhois(Module* Creator)
+ : SimpleUserModeHandler(Creator, "showwhois", 'W')
{
- oper = IsOpersOnly;
}
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
+ void SetOperOnly(bool 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;
- }
- }
-
- return MODEACTION_DENY;
+ oper = operonly;
}
};
class WhoisNoticeCmd : public Command
{
public:
- WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
+ WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 2)
{
+ flags_needed = FLAG_SERVERONLY;
}
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());
+ dest->WriteNotice("*** " + src->nick + " (" + src->ident + "@" +
+ src->GetHost(dest->HasPrivPermission("users/auspex")) +
+ ") did a /whois on you");
}
- CmdResult Handle(const std::vector<std::string> ¶meters, User *user)
+ CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
{
User* dest = ServerInstance->FindNick(parameters[0]);
+ if (!dest)
+ return CMD_FAILURE;
- if (IS_LOCAL(dest))
- HandleFast(dest, user);
+ 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
{
bool ShowWhoisFromOpers;
- SeeWhois* sw;
+ SeeWhois sw;
WhoisNoticeCmd cmd;
public:
- ModuleShowwhois() : cmd(this)
+ ModuleShowwhois()
+ : Whois::EventListener(this)
+ , sw(this)
+ , cmd(this)
{
- ConfigReader conf;
- bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
- ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
-
- 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);
}
- ~ModuleShowwhois()
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
- 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("Allows opers to set +W to see when a user uses WHOIS on them",VF_COMMON|VF_VENDOR);
+ return Version("Provides user mode +W for opers to see when a user uses WHOIS on them", 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 && (!IS_OPER(source) != !IS_OPER(dest)))
+ if (!ShowWhoisFromOpers && source->IsOper())
return;
if (IS_LOCAL(dest))
}
else
{
- std::vector<std::string> params;
- params.push_back(dest->server);
- params.push_back("WHOISNOTICE");
+ CommandBase::Params params;
params.push_back(dest->uuid);
- ServerInstance->PI->SendEncapsulatedData(params);
+ params.push_back(source->uuid);
+ ServerInstance->PI->SendEncapsulatedData(dest->server->GetName(), cmd.name, params);
}
}
-
};
MODULE_INIT(ModuleShowwhois)